Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 060f2532b0 |
@@ -6,3 +6,6 @@ Size (popt-1.16.tar.gz) = 702769 bytes
|
||||
SHA1 (patch-aa) = 7edb4bbd7fe044da9f388159fdc22327377e267e
|
||||
SHA1 (patch-lookup3.c) = 7643b577c0913742fc4333c4469d606d81b6aa98
|
||||
SHA1 (patch-poptint.h) = c26b97bdeedf8a057009dfca985eb9287220f54b
|
||||
SHA1 (patch-zz-minix-a) = 2ab9d08e2fc8dc07202a33e21d5595d6479a2401
|
||||
SHA1 (patch-zz-minix-b) = 5321a1a4572555005e63e6a5af97892db7a38148
|
||||
SHA1 (patch-zz-minix-c) = 86137b8927325dc856ebc4e7e5a3a7a61f402690
|
||||
|
||||
15
devel/popt/patches/patch-zz-minix-a
Normal file
15
devel/popt/patches/patch-zz-minix-a
Normal file
@@ -0,0 +1,15 @@
|
||||
--- poptconfig.c.orig Sun Oct 4 12:34:19 2015
|
||||
+++ poptconfig.c Sun Oct 4 12:35:21 2015
|
||||
@@ -42,10 +42,10 @@
|
||||
/*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
|
||||
#endif /* __LCLINT__ */
|
||||
|
||||
-#if defined(__NetBSD__)
|
||||
+#if defined(__NetBSD__) || defined(__minix)
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
-#if !defined(__GLIBC__) && (!defined(__NetBSD__) || __NetBSD_Version__ < 599001100)
|
||||
+#if !defined(__GLIBC__) && !defined(__minix) && (!defined(__NetBSD__) || __NetBSD_Version__ < 599001100)
|
||||
/* Return nonzero if PATTERN contains any metacharacters.
|
||||
Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
|
||||
static int
|
||||
29
devel/popt/patches/patch-zz-minix-b
Normal file
29
devel/popt/patches/patch-zz-minix-b
Normal file
@@ -0,0 +1,29 @@
|
||||
--- config.rpath.orig Sun Oct 4 12:36:32 2015
|
||||
+++ config.rpath Sun Oct 4 12:37:46 2015
|
||||
@@ -203,7 +203,7 @@
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
- netbsd*)
|
||||
+ minix* | netbsd*)
|
||||
;;
|
||||
solaris*)
|
||||
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
|
||||
@@ -405,7 +405,7 @@
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
hardcode_libdir_separator=:
|
||||
;;
|
||||
- netbsd*)
|
||||
+ minix* | netbsd*)
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
;;
|
||||
@@ -582,7 +582,7 @@
|
||||
knetbsd*-gnu)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
- netbsd*)
|
||||
+ minix* | netbsd*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
newsos6)
|
||||
57
devel/popt/patches/patch-zz-minix-c
Normal file
57
devel/popt/patches/patch-zz-minix-c
Normal file
@@ -0,0 +1,57 @@
|
||||
--- configure.orig Sun Oct 4 12:38:55 2015
|
||||
+++ configure Sun Oct 4 12:41:52 2015
|
||||
@@ -5826,7 +5826,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`
|
||||
@@ -6233,7 +6233,7 @@
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
-netbsd*)
|
||||
+minix* | 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)$'
|
||||
else
|
||||
@@ -9626,7 +9626,7 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
- netbsd*)
|
||||
+ minix* | netbsd*)
|
||||
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
||||
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
||||
wlarc=
|
||||
@@ -10215,7 +10215,7 @@
|
||||
link_all_deplibs=yes
|
||||
;;
|
||||
|
||||
- netbsd*)
|
||||
+ minix* | netbsd*)
|
||||
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
||||
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
||||
else
|
||||
@@ -11193,6 +11193,18 @@
|
||||
# people can always --disable-shared, the test was removed, and we
|
||||
# assume the GNU/Linux dynamic linker is in use.
|
||||
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*)
|
||||
@@ -8,5 +8,3 @@ 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
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- 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*)
|
||||
@@ -1,106 +0,0 @@
|
||||
--- 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
|
||||
Reference in New Issue
Block a user