diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
| commit | 15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch) | |
| tree | 727d3fd768a1abe75521190b90833b3a68cce4c6 /package/libaudiofile | |
| parent | 0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff) | |
fix packages to be compile with stack protector
- libtool do not pass -fstack-protector while linking,
but this is required to successfully link libraries or
executables with SSP
- pass LDFLAGS for non-libtool packages
Diffstat (limited to 'package/libaudiofile')
| -rw-r--r-- | package/libaudiofile/Makefile | 12 | ||||
| -rw-r--r-- | package/libaudiofile/patches/001-audiofile-config-libdirs.patch | 6 | ||||
| -rw-r--r-- | package/libaudiofile/patches/patch-ltmain_sh | 27 |
3 files changed, 36 insertions, 9 deletions
diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index 4b4f74d35..be4e93c61 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -3,14 +3,14 @@ include ${TOPDIR}/rules.mk -PKG_NAME:= libaudiofile -PKG_VERSION:= 0.2.6 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 460f848ce5f4a33ae66b15a4fb7720ec +PKG_NAME:= audiofile +PKG_VERSION:= 0.2.7 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a39be317a7b1971b408805dc5e371862 PKG_DESCR:= audiofile library PKG_SECTION:= libs -PKG_URL:= http://www.68k.org/~michael/audiofile -PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_URL:= http://www.68k.org/~michael/audiofile/ +PKG_SITES:= http://www.68k.org/~michael/audiofile/ include ${TOPDIR}/mk/package.mk diff --git a/package/libaudiofile/patches/001-audiofile-config-libdirs.patch b/package/libaudiofile/patches/001-audiofile-config-libdirs.patch index ba92d7d4e..ef3ea3c0f 100644 --- a/package/libaudiofile/patches/001-audiofile-config-libdirs.patch +++ b/package/libaudiofile/patches/001-audiofile-config-libdirs.patch @@ -1,6 +1,6 @@ ---- libaudiofile-0.2.6/audiofile-config.in.orig 2004-03-06 07:39:23.000000000 +0100 -+++ libaudiofile-0.2.6/audiofile-config.in 2005-12-13 14:15:52.000000000 +0100 -@@ -45,7 +45,9 @@ +--- libaudiofile-0.2.6.orig/audiofile-config.in 2004-03-06 07:39:23.000000000 +0100 ++++ libaudiofile-0.2.6/audiofile-config.in 2011-01-14 22:38:44.000000000 +0100 +@@ -45,7 +45,9 @@ while test $# -gt 0; do echo $includes ;; --libs) diff --git a/package/libaudiofile/patches/patch-ltmain_sh b/package/libaudiofile/patches/patch-ltmain_sh new file mode 100644 index 000000000..499a548dd --- /dev/null +++ b/package/libaudiofile/patches/patch-ltmain_sh @@ -0,0 +1,27 @@ +--- audiofile-0.2.7.orig/ltmain.sh 2010-03-22 04:48:34.000000000 +0100 ++++ audiofile-0.2.7/ltmain.sh 2011-01-14 23:13:46.000000000 +0100 +@@ -1422,7 +1422,6 @@ EOF + esac + continue + ;; +- + -L*) + dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` + # We need an absolute path. +@@ -1503,15 +1502,9 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + if test "$with_gcc" = "yes" ; then |