From d23f3c1d1adfce0196738c90fc61a49b52e4b4db Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Sun, 25 Oct 2015 22:03:39 +0000 Subject: [PATCH] x11/gtk2 --- x11/gtk2/distinfo | 2 + x11/gtk2/patches/patch-zz-minix-a | 11 ++++ x11/gtk2/patches/patch-zz-minix-b | 106 ++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+) create mode 100644 x11/gtk2/patches/patch-zz-minix-a create mode 100644 x11/gtk2/patches/patch-zz-minix-b diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index 96512204a..6299c2343 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -8,3 +8,5 @@ SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3 SHA1 (patch-gdk_x11_gdkwindow-x11.c) = 08c05b31da38e16727a2941cdec4c855f2fc7d77 SHA1 (patch-gtk_gtktooltips.c) = 593e43bb0aacc0b07c24959f2ac6d84dfd04a780 +SHA1 (patch-zz-minix-a) = f5ff6d1aeb6f4e9edefc66986ed4bb3e2f6048a1 +SHA1 (patch-zz-minix-b) = ede94a1bde08e1e7bd4572b3452f7d40a6ce01f9 diff --git a/x11/gtk2/patches/patch-zz-minix-a b/x11/gtk2/patches/patch-zz-minix-a new file mode 100644 index 000000000..3623634e5 --- /dev/null +++ b/x11/gtk2/patches/patch-zz-minix-a @@ -0,0 +1,11 @@ +--- ltmain.sh.orig Sun Oct 25 21:56:04 2015 ++++ ltmain.sh Sun Oct 25 21:56:37 2015 +@@ -7627,7 +7627,7 @@ + # Rhapsody C library is in the System framework + func_append deplibs " System.ltframework" + ;; +- *-*-netbsd*) ++ *-*-minix*|*-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) diff --git a/x11/gtk2/patches/patch-zz-minix-b b/x11/gtk2/patches/patch-zz-minix-b new file mode 100644 index 000000000..cc3c61eb3 --- /dev/null +++ b/x11/gtk2/patches/patch-zz-minix-b @@ -0,0 +1,106 @@ +--- configure.orig Sun Oct 25 21:57:33 2015 ++++ configure Sun Oct 25 22:00:36 2015 +@@ -6303,7 +6303,7 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ minix* | netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +@@ -6797,6 +6797,10 @@ + lt_cv_deplibs_check_method=pass_all + ;; + ++minix*) ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' ++ ;; ++ + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' +@@ -10396,6 +10400,11 @@ + fi + ;; + ++ minix*) ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' +@@ -11026,6 +11035,13 @@ + link_all_deplibs=yes + ;; + ++ minix*) ++ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out +@@ -12058,6 +12074,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++minix*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Minix ld.elf_so' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -14134,6 +14162,10 @@ + esac + ;; + ++ minix*) ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' +@@ -14893,6 +14925,8 @@ + ;; + esac + ;; ++ minix*) ++ ;; + netbsd*) + ;; + *qnx* | *nto*) +@@ -15893,6 +15927,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++minix*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Minix ld.elf_so' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no