diff options
author | Junqian Gordon Xu <xjqian@gmail.com> | 2008-01-30 11:50:03 +0000 |
---|---|---|
committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-01-30 11:50:03 +0000 |
commit | 6014e161475141f4197807a0c43b409d9694db37 (patch) | |
tree | c8d8edecdce60a0d89c8013679f5ba18c81f090c | |
parent | c5dd5bfdffff19a8bbef1248789f102c7cab0493 (diff) |
speex: fix packaging *.h headers
* remove hardcoded -I/usr/indlude is fine but remove all of the "includedir"
strings in the Makefiles is an overreaction and causes problem during installation
-rw-r--r-- | packages/speex/speex_1.1.12+1.2beta1.bb | 4 | ||||
-rw-r--r-- | packages/speex/speex_1.1.12.bb | 4 | ||||
-rw-r--r-- | packages/speex/speex_1.1.7.bb | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/packages/speex/speex_1.1.12+1.2beta1.bb b/packages/speex/speex_1.1.12+1.2beta1.bb index 5430983e36..51ad2f506e 100644 --- a/packages/speex/speex_1.1.12+1.2beta1.bb +++ b/packages/speex/speex_1.1.12+1.2beta1.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "BSD" HOMEPAGE = "http://www.speex.org" DEPENDS = "libogg" -PR = "r1" +PR = "r2" SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta1.tar.gz" S = "${WORKDIR}/${PN}-1.2beta1" @@ -27,8 +27,6 @@ EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point " do_configure_append() { sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile - perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile - perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile } diff --git a/packages/speex/speex_1.1.12.bb b/packages/speex/speex_1.1.12.bb index b18151e48d..7417ce4504 100644 --- a/packages/speex/speex_1.1.12.bb +++ b/packages/speex/speex_1.1.12.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "BSD" HOMEPAGE = "http://www.speex.org" DEPENDS = "libogg" -PR = "r1" +PR = "r2" SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz" @@ -25,8 +25,6 @@ EXTRA_OECONF_append_arm = " --enable-fixed-point " do_configure_append() { sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile - perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile - perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile } diff --git a/packages/speex/speex_1.1.7.bb b/packages/speex/speex_1.1.7.bb index 00b51b1c2e..ef818794de 100644 --- a/packages/speex/speex_1.1.7.bb +++ b/packages/speex/speex_1.1.7.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "BSD" HOMEPAGE = "http://www.speex.org" DEPENDS = "libogg" -PR = "r0" +PR = "r1" SRC_URI = "http://www.speex.org/download/speex-${PV}.tar.gz" @@ -21,8 +21,6 @@ EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point" do_configure_append() { sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile - perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile - perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile } |