Commit 9a44e462 authored by Sandrine Avakian's avatar Sandrine Avakian

More fixes

parent b382e618
......@@ -16,7 +16,7 @@ inherit cmake pkgconfig
# ./autogen.sh
#}
do_package_prepend() {
do_install_append() {
mkdir -p ${STAGING_DIR_HOST}/usr/share/java
cp ${S}/../../antlr-3.4-complete.jar ${STAGING_DIR_HOST}/usr/share/java/antlr.jar
}
\ No newline at end of file
......@@ -12,31 +12,11 @@ S = "${WORKDIR}/git"
INSANE_SKIP_${PN} += "dev-deps "
PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev "
inherit cmake pkgconfig
EXTRA_OECMAKE += " -DENABLE_STATIC=NO -DENABLE_TESTS=OFF -DENABLE_TESTS_COMPONENT=OFF -DCMAKE_SKIP_INSTALL_RPATH=ON"
FILES_${PN} += "\
${bindir}/* \
${sbindir}/* \
${libexecdir}/* \
${libdir}/lib*.so.* \
${sysconfdir} \
${sharedstatedir} \
${localstatedir} \
/bin/* \
/sbin/* \
/lib/*.so* \
${datadir}/${PN} \
${libdir}/${PN}/* "
FILES_${PN}-dev += " \
${includedir} \
${libdir}/lib*.so \
${libdir}/*.la \
${libdir}/*.a \
${libdir}/*.o \
${libdir}/pkgconfig \
${prefix}/share/bctoolbox/ "
\ No newline at end of file
inherit distutils-base cmake pkgconfig
#PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev "
#-DCMAKE_BUILD_TYPE=Release
EXTRA_OECMAKE += " -DENABLE_STATIC=NO -DENABLE_TESTS=OFF -DENABLE_TESTS_COMPONENT=OFF -DCMAKE_SKIP_INSTALL_RPATH=ON"
......@@ -10,16 +10,16 @@ PROVIDES = "libbellesip"
S = "${WORKDIR}/git"
EXTRA_OECMAKE += " -DENABLE_STRICT=NO -DCMAKE_SKIP_INSTALL_RPATH=ON "
inherit pkgconfig cmake gettext
ANTLR_CFLAGS += " -I ${STAGING_DIR_HOST}${layout_exec_prefix}/usr/include"
ANTLR_LIBS += " -L ${STAGING_DIR_HOST}${layout_exec_prefix}/usr/lib"
EXTRA_OECMAKE += " -DENABLE_STRICT=NO -DCMAKE_SKIP_INSTALL_RPATH=ON"
ANTLR_CFLAGS += " -I ${STAGING_DIR_HOST}/usr/include"
ANTLR_LIBS += " -L ${STAGING_DIR_HOST}/usr/lib"
CFLAGS += " ${ANTLR_CFLAGS} ${ANTLR_LIBS} -lantlr3c"
INSANE_SKIP_${PN} += "dev-deps"
inherit cmake pkgconfig
INSANE_SKIP_${PN} += "dev-deps"
FILES_${PN}-dev = " \
......@@ -29,5 +29,9 @@ FILES_${PN}-dev = " \
${libdir}/*.a \
${libdir}/*.o \
${libdir}/pkgconfig \
${prefix}/share/BelleSIP/"
${prefix}/share/BelleSIP"
......@@ -46,4 +46,4 @@
+ find_package(Java COMPONENTS Runtime REQUIRED)
find_file(ANTLR3_JAR_PATH
NAMES antlr3.jar antlr.jar
HINTS ${_ANTLR3_JAR_ROOT_PATHS}
\ No newline at end of file
HINTS ${_ANTLR3_JAR_ROOT_PATHS}
......@@ -10,8 +10,9 @@ inherit cmake pkgconfig
PROVIDES = "libgsm"
PACKAGES = " ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev "
#EXTRA_OECMAKE += " -DCMAKE_SKIP_INSTALL_RPATH=ON"
FILES_${PN} += " \
${libdir}/lib*.so "
FILES_${PN}-dbg += "\
${libdir}/.debug/ \"
\ No newline at end of file
${libdir}/.debug/ \"
......@@ -11,4 +11,4 @@ SRC_URI = "git://git.linphone.org/gsm.git;branch=linphone"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5"
\ No newline at end of file
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5"
......@@ -139,7 +139,7 @@ FILES_${PN}-dev += " \
${libdir}/pkgconfig \
${prefix}/share/Linphone "
do_configure_prepend() {
#!/bin/sh
echo 'Deleting mediastreamer2 and oRTP'
......@@ -147,3 +147,4 @@ do_configure_prepend() {
rm -rf ${S}/oRTP
echo 'mediastreamer2 and oRTP have been removed'
}
--- a/src/CMakeLists.txt 2017-05-02 15:02:55.000000000 +0200
+++ b/src/CMakeLists.txt 2017-05-02 15:04:01.000000000 +0200
@@ -31,7 +31,7 @@
find_library(LIBMINGWEX NAMES mingwex)
find_library(LIBMINGWEX NAMES mingwex)
endif()
-find_program(AWK_PROGRAM awk)
+find_program(AWK_PROGRAM awk NO_CMAKE_FIND_ROOT_PATH)
if(NOT AWK_PROGRAM)
message(FATAL_ERROR "You need the awk program to build mediastreamer2.")
message(FATAL_ERROR "You need the awk program to build mediastreamer2.")
endif()
--- a/src/CMakeLists.txt 2017-05-02 15:02:55.000000000 +0200
+++ b/src/CMakeLists.txt 2017-05-02 15:04:01.000000000 +0200
@@ -461,7 +464,7 @@
if(APPLE OR ANDROID OR OPENGL_FOUND OR GLX_FOUND OR QTANGLE_FOUND)
find_package(PythonInterp REQUIRED)
- find_program(SED_PROGRAM sed)
+ find_program(SED_PROGRAM sed NO_CMAKE_FIND_ROOT_PATH)
if(NOT SED_PROGRAM)
message(FATAL_ERROR "You need the sed program to build mediastreamer2.")
endif()
find_package(PythonInterp REQUIRED)
- find_program(SED_PROGRAM sed)
+ find_program(SED_PROGRAM sed NO_CMAKE_FIND_ROOT_PATH)
if(NOT SED_PROGRAM)
message(FATAL_ERROR "You need the sed program to build mediastreamer2.")
endif()
......@@ -10,9 +10,11 @@ EXTRA_OECMAKE += " -DENABLE_ISAC=NO "
FILES_${PN} = "${libdir}/mediastreamer/plugins/*.so.*"
FILES_${PN}-dev = "${libdir}/mediastreamer/plugins/*.la ${libdir}/mediastreamer/plugins/*.so"
FILES_${PN}-dev += " ${libdir}/mediastreamer/plugins/*.a "
FILES_${PN}-dbg = "${libdir}/mediastreamer/plugins/.debug/*.so.* /usr/src/debug"
FILES_${PN}-dev += " ${libdir}/mediastreamer/plugins/*.a "
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
inherit cmake pkgconfig
inherit cmake pkgconfig
......@@ -18,6 +18,5 @@ FILES_${PN}-dev = " \
${libdir}/*.a \
${libdir}/*.o \
${libdir}/pkgconfig \
${prefix}/share/oRTP/"
${prefix}/share/oRTP/"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment