summaryrefslogtreecommitdiff
path: root/package/libvorbis
diff options
context:
space:
mode:
Diffstat (limited to 'package/libvorbis')
-rw-r--r--package/libvorbis/Makefile8
-rw-r--r--package/libvorbis/patches/patch-ltmain_sh11
2 files changed, 14 insertions, 5 deletions
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index 484ffa867..a980c64a7 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -23,19 +23,17 @@ $(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${P
$(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBVORBIS_DEV,libvorbis-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBVORBIS_DEV},${PKGSC_LIBVORBIS_DEV}))
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBVORBIS_DEV}+= libvorbis-dev-install
-
CONFIGURE_ENV+= LIBS="-lm -logg"
CONFIGURE_ARGS+= --with-ogg="${STAGING_TARGET_DIR}/usr" \
--with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \
--with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib"
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib
${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib/
${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib/
+
+libvorbisenc-install:
${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib
${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/
diff --git a/package/libvorbis/patches/patch-ltmain_sh b/package/libvorbis/patches/patch-ltmain_sh
new file mode 100644
index 000000000..c3d5bdd93
--- /dev/null
+++ b/package/libvorbis/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- libvorbis-1.2.0.orig/ltmain.sh 2006-06-19 21:29:20.000000000 +0200
++++ libvorbis-1.2.0/ltmain.sh 2011-01-15 21:27:10.000000000 +0100
+@@ -1623,7 +1623,7 @@ EOF
+ # -pg pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+- -t[45]*|-txscale*|@*)
++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto)
+
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.