diff options
author | ryoon <ryoon@pkgsrc.org> | 2017-08-19 10:02:15 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2017-08-19 10:02:15 +0000 |
commit | 232848645a31217fa5443ddf76b63c012134d3aa (patch) | |
tree | 556247c694c714406cb280372f740bc3b86ff91b | |
parent | 4d8bc8058f387641c9698fab06f8212fefcb1117 (diff) | |
download | pkgsrc-232848645a31217fa5443ddf76b63c012134d3aa.tar.gz |
Fix xine detection from disabling PaX MPROTECT for conftest test program
during configure stage
* Fix packageing on NetBSD/i386 (8.99.1)
Original problem is reported by mlh
-rw-r--r-- | multimedia/kdemultimedia3/distinfo | 4 | ||||
-rw-r--r-- | multimedia/kdemultimedia3/patches/patch-aa | 48 |
2 files changed, 32 insertions, 20 deletions
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 9cb28fb172a..ce86f005d38 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.43 2015/11/03 23:54:27 agc Exp $ +$NetBSD: distinfo,v 1.44 2017/08/19 10:02:15 ryoon Exp $ SHA1 (kdemultimedia-3.5.10.tar.bz2) = c85337b959882ec9f3bb51f5e1ee4ec74a988518 RMD160 (kdemultimedia-3.5.10.tar.bz2) = b03b5363f29e1e75dcb3f13fddb7a01d17e337b5 SHA512 (kdemultimedia-3.5.10.tar.bz2) = 4ab85eeee7ec0c38136bb59d698200636563f8d5d2eb501439ff46e02f5b419671b650a80a41b8217e7b6d1fbdc5a9b181feeb7fb81ab5bdf637a81f4aba0af2 Size (kdemultimedia-3.5.10.tar.bz2) = 6333219 bytes -SHA1 (patch-aa) = 4e561e1f4cb026f8dd5e9069c653bf45ceafcf93 +SHA1 (patch-aa) = f6aea8d05646c6860b2fcef17128196aeb2f463d SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413 SHA1 (patch-ad) = 55deb605003a4ba0bfc37babe8657c3408728f62 diff --git a/multimedia/kdemultimedia3/patches/patch-aa b/multimedia/kdemultimedia3/patches/patch-aa index 82fcc16ba43..35e914cfc11 100644 --- a/multimedia/kdemultimedia3/patches/patch-aa +++ b/multimedia/kdemultimedia3/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ +$NetBSD: patch-aa,v 1.16 2017/08/19 10:02:15 ryoon Exp $ ---- configure.orig 2007-10-09 03:27:15.000000000 +1300 +--- configure.orig 2008-08-20 15:47:03.000000000 +0000 +++ configure -@@ -34934,7 +34910,7 @@ if test "${ac_cv_lib_ossaudio__oss_ioctl +@@ -35079,7 +35079,7 @@ if test "${ac_cv_lib_ossaudio__oss_ioctl echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -34998,7 +34974,7 @@ fi +@@ -35143,7 +35143,7 @@ fi if test "x$have_ossaudio" = xyes; then # for kmix/ and akode/ @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ fi -@@ -35571,7 +35547,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -35716,7 +35716,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" -@@ -35611,7 +35587,7 @@ _ACEOF +@@ -35756,7 +35756,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in -@@ -35712,7 +35688,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -35857,7 +35857,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ int main () -@@ -37701,7 +37677,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetTRMC +@@ -37846,7 +37846,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetTRMC echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -38572,13 +38548,13 @@ if test $ac_cv_header_FLAC_metadata_h = +@@ -38717,13 +38717,13 @@ if test $ac_cv_header_FLAC_metadata_h = test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac @@ -74,7 +74,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -38592,11 +38568,11 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -38737,11 +38737,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif @@ -88,7 +88,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ ; return 0; } -@@ -38619,21 +38595,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -38764,21 +38764,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ have_libFLAC=yes fi -@@ -38827,9 +38803,9 @@ if test $ac_cv_header_OggFLAC_seekable_s +@@ -38972,9 +38972,9 @@ if test $ac_cv_header_OggFLAC_seekable_s test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac @@ -128,7 +128,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -38847,11 +38823,11 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -38992,11 +38992,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif @@ -142,7 +142,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ ; return 0; } -@@ -38874,21 +38850,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -39019,21 +39019,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -169,7 +169,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ have_libOggFLAC=yes fi -@@ -40652,7 +40628,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -40797,7 +40797,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest.$ac_objext; then @@ -192,7 +192,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ else echo "$as_me: failed program was:" >&5 -@@ -40713,7 +40704,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -40858,7 +40873,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest.$ac_objext; then @@ -215,7 +215,7 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ else echo "$as_me: failed program was:" >&5 -@@ -40774,7 +40780,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -40919,7 +40949,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest.$ac_objext; then @@ -238,7 +238,19 @@ $NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ else echo "$as_me: failed program was:" >&5 -@@ -45675,11 +45668,6 @@ done # for ac_tag +@@ -42764,6 +42809,11 @@ echo $ECHO_N "checking for XINE-LIB vers + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++case $host_os in ++netbsd*) ++ac_link="$ac_link && paxctl +m conftest$ac_exeext" ++;; ++esac + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + rm -f conf.xinetest +@@ -45821,11 +45871,6 @@ done # for ac_tag { (exit 0); exit 0; } _ACEOF |