From 8a2a87947a766fe709dbb713cc4f5e417c594be1 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Sat, 19 Apr 2014 16:06:28 +0200 Subject: [PATCH] Step 2: base dep: lang/python27 --- lang/python27/Makefile | 13 ++- lang/python27/PLIST.common | 2 - lang/python27/distinfo | 9 +- .../patches/{patch-aa => patch-zz-minix-a} | 8 +- lang/python27/patches/patch-zz-minix-b | 11 +++ lang/python27/patches/patch-zz-minix-c | 12 +++ lang/python27/patches/patch-zz-minix-d | 94 +++++++++++++++++++ lang/python27/patches/patch-zz-minix-e | 11 +++ lang/python27/patches/patch-zz-minix-f | 13 +++ lang/python27/patches/patch-zz-minix-g | 13 +++ lang/python27/patches/patch-zz-minix-h | 47 ++++++++++ 11 files changed, 222 insertions(+), 11 deletions(-) rename lang/python27/patches/{patch-aa => patch-zz-minix-a} (68%) create mode 100644 lang/python27/patches/patch-zz-minix-b create mode 100644 lang/python27/patches/patch-zz-minix-c create mode 100644 lang/python27/patches/patch-zz-minix-d create mode 100644 lang/python27/patches/patch-zz-minix-e create mode 100644 lang/python27/patches/patch-zz-minix-f create mode 100644 lang/python27/patches/patch-zz-minix-g create mode 100644 lang/python27/patches/patch-zz-minix-h diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 3ce11551b..f6b78194f 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -29,12 +29,18 @@ CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh USE_LANGUAGES= c c++ +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix" +CONFIGURE_ARGS+= --without-threads +.else PTHREAD_OPTS+= require PTHREAD_AUTO_VARS= yes .include "../../mk/pthread.buildlink3.mk" .if ${PTHREAD_TYPE} == "pth" CONFIGURE_ARGS+= --with-pth .endif +.endif .include "../../mk/compiler.mk" @@ -43,8 +49,6 @@ CONFIGURE_ARGS+= --with-pth CFLAGS+= -fwrapv .endif -.include "../../mk/bsd.prefs.mk" - # fdatasync() LIBS.SunOS+= -lrt @@ -77,6 +81,8 @@ PY_PLATNAME= hp-ux11 PY_PLATNAME= linux2 .elif ${OS_VARIANT} == "SCOOSR5" PY_PLATNAME= sco_sv3 +.elif ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix" +PY_PLATNAME= minix3 .else PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif @@ -117,7 +123,8 @@ PLIST.nis= yes . endif .else PLIST.dll= yes -. if ${OPSYS} == "MirBSD" +. if ${OPSYS} == "MirBSD" || \ + (${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix") # neither nis nor no-nis . elif ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) PLIST.nis= yes diff --git a/lang/python27/PLIST.common b/lang/python27/PLIST.common index 6454616e0..3ff2e9598 100644 --- a/lang/python27/PLIST.common +++ b/lang/python27/PLIST.common @@ -1903,7 +1903,6 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_json.so lib/python${PY_VER_SUFFIX}/lib-dynload/_locale.so lib/python${PY_VER_SUFFIX}/lib-dynload/_lsprof.so lib/python${PY_VER_SUFFIX}/lib-dynload/_multibytecodec.so -lib/python${PY_VER_SUFFIX}/lib-dynload/_multiprocessing.so lib/python${PY_VER_SUFFIX}/lib-dynload/_random.so lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so @@ -1927,7 +1926,6 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so ${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so lib/python${PY_VER_SUFFIX}/lib-dynload/math.so -lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so ${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so ${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 9608ae7a4..f7e4409af 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -12,7 +12,6 @@ SHA1 (patch-Modules_getpath.c) = 9bb2c040895ad6bbe4d0b5807803723b5437d47b SHA1 (patch-Modules_mmapmodule.c) = 3f401b59883af3232b6c77a76a08e5feffa77044 SHA1 (patch-Modules_posixmodule.c) = 5105d380cd49bf49b8adbd9aa5ffb245195728ed SHA1 (patch-Modules_socketmodule.c) = 16848d90947b3de1f921a0813fa5c317f76961d4 -SHA1 (patch-aa) = d9626c1648d7ff2a7da7352665bcb05f4ab0412a SHA1 (patch-ab) = ea4feba4e93dbcff07050c82a00d591bb650e934 SHA1 (patch-ad) = 96ae702995d434e2d7ec0ac62e37427a90b61d13 SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6 @@ -28,3 +27,11 @@ SHA1 (patch-ax) = 8a7a0e5cbfec279a05945dffafea1b1131a76f0e SHA1 (patch-az) = 01e113b0bd251978b555caaaa60b79c372edebce SHA1 (patch-pyconfig.h.in) = a0143ecdc2a3fb10220d0e3ee94fb9779a45e9e1 SHA1 (patch-xa) = 517cfefc2f2e13631d22bad28c327513cdf17c10 +SHA1 (patch-zz-minix-a) = f59154104088042b2d9a1d83c73e2f6f2da33524 +SHA1 (patch-zz-minix-b) = 99a37f472330bbacffd3816b867f9b20885ffa5f +SHA1 (patch-zz-minix-c) = 9a9a850f15f41495b375ca4b6eb566485cfb2786 +SHA1 (patch-zz-minix-d) = 4ba714402265c7c2eeb8b6cd322875fdb0e61dcd +SHA1 (patch-zz-minix-e) = 7f4d5dcf68ec974a4e0c71367c7058d46cf2e975 +SHA1 (patch-zz-minix-f) = 0ea19fae393c40314248288106b11860dbe2ba56 +SHA1 (patch-zz-minix-g) = 6de925720214359de6f98dac85368e1284236a04 +SHA1 (patch-zz-minix-h) = 410849963425a4156cb557c0eae73f897cab2f8b diff --git a/lang/python27/patches/patch-aa b/lang/python27/patches/patch-zz-minix-a similarity index 68% rename from lang/python27/patches/patch-aa rename to lang/python27/patches/patch-zz-minix-a index 779eec948..50162c05f 100644 --- a/lang/python27/patches/patch-aa +++ b/lang/python27/patches/patch-zz-minix-a @@ -1,12 +1,10 @@ -$NetBSD: patch-aa,v 1.2 2015/04/24 03:01:36 rodent Exp $ - ---- Include/py_curses.h.orig 2014-12-10 15:59:32.000000000 +0000 -+++ Include/py_curses.h +--- Include/py_curses.h.orig Sun Nov 10 07:36:39 2013 ++++ Include/py_curses.h Fri Apr 18 18:45:25 2014 @@ -44,6 +44,21 @@ #endif #endif -+#ifdef __NetBSD__ ++#if defined __NetBSD__ || defined __minix +/* +** On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards +** against multiple definition of wchar_t and wint_t. diff --git a/lang/python27/patches/patch-zz-minix-b b/lang/python27/patches/patch-zz-minix-b new file mode 100644 index 000000000..9e822040d --- /dev/null +++ b/lang/python27/patches/patch-zz-minix-b @@ -0,0 +1,11 @@ +--- Python/dynload_shlib.c.orig Fri Apr 18 18:42:43 2014 ++++ Python/dynload_shlib.c Fri Apr 18 18:43:00 2014 +@@ -7,7 +7,7 @@ + #include + #include + +-#if defined(__NetBSD__) ++#if defined(__NetBSD__) || defined(__minix) + #include + #if (NetBSD < 199712) + #include diff --git a/lang/python27/patches/patch-zz-minix-c b/lang/python27/patches/patch-zz-minix-c new file mode 100644 index 000000000..b91b85276 --- /dev/null +++ b/lang/python27/patches/patch-zz-minix-c @@ -0,0 +1,12 @@ +--- Modules/posixmodule.c.orig Fri Apr 18 18:53:21 2014 ++++ Modules/posixmodule.c Fri Apr 18 18:53:52 2014 +@@ -2098,7 +2098,8 @@ Return a string representing the current working direc + + #if (defined(__sun) && defined(__SVR4)) || \ + defined(__OpenBSD__) || \ +- defined(__NetBSD__) ++ defined(__NetBSD__) || \ ++ defined(__minix) + /* Issue 9185: getcwd() returns NULL/ERANGE indefinitely. */ + static PyObject * + posix_getcwd(PyObject *self, PyObject *noargs) diff --git a/lang/python27/patches/patch-zz-minix-d b/lang/python27/patches/patch-zz-minix-d new file mode 100644 index 000000000..a52619d83 --- /dev/null +++ b/lang/python27/patches/patch-zz-minix-d @@ -0,0 +1,94 @@ +--- Modules/_ctypes/libffi/configure.orig Sat Apr 25 13:51:54 2015 ++++ Modules/_ctypes/libffi/configure Sat Apr 25 13:56:19 2015 +@@ -5898,7 +5898,7 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) ++ bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*) + # 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` +@@ -6367,7 +6367,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 +@@ -10121,7 +10121,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= +@@ -10752,7 +10752,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 +@@ -11788,6 +11788,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 +@@ -13859,7 +13871,7 @@ + esac + ;; + +- netbsd*) ++ minix* | 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' + wlarc= +@@ -14614,7 +14626,7 @@ + ;; + esac + ;; +- netbsd*) ++ minix* | netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -15617,6 +15629,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*) diff --git a/lang/python27/patches/patch-zz-minix-e b/lang/python27/patches/patch-zz-minix-e new file mode 100644 index 000000000..6a4388e98 --- /dev/null +++ b/lang/python27/patches/patch-zz-minix-e @@ -0,0 +1,11 @@ +--- Modules/_ctypes/libffi/ltmain.sh.orig Fri Apr 18 19:11:06 2014 ++++ Modules/_ctypes/libffi/ltmain.sh Fri Apr 18 19:11:33 2014 +@@ -7627,7 +7627,7 @@ func_mode_link () + # Rhapsody C library is in the System framework + func_append deplibs " System.ltframework" + ;; +- *-*-netbsd*) ++ *-*-netbsd* | *-*-minix*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) diff --git a/lang/python27/patches/patch-zz-minix-f b/lang/python27/patches/patch-zz-minix-f new file mode 100644 index 000000000..a84240fa7 --- /dev/null +++ b/lang/python27/patches/patch-zz-minix-f @@ -0,0 +1,13 @@ +--- Modules/_ctypes/libffi/config.guess.orig Sat Apr 25 13:58:47 2015 ++++ Modules/_ctypes/libffi/config.guess Sat Apr 25 13:59:57 2015 +@@ -880,8 +880,8 @@ + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; +- i*86:Minix:*:*) +- echo ${UNAME_MACHINE}-pc-minix ++ *:Minix:*:*) ++ echo ${UNAME_MACHINE}-elf32-minix + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} diff --git a/lang/python27/patches/patch-zz-minix-g b/lang/python27/patches/patch-zz-minix-g new file mode 100644 index 000000000..abd0eea56 --- /dev/null +++ b/lang/python27/patches/patch-zz-minix-g @@ -0,0 +1,13 @@ +--- setup.py.orig Sat Apr 25 15:57:29 2015 ++++ setup.py Sat Apr 25 15:58:11 2015 +@@ -1396,6 +1396,10 @@ + macros = dict() + libraries = [] + ++ elif host_platform.startswith('minix'): ++ macros = dict() ++ libraries = [] ++ + elif host_platform.startswith('netbsd'): + macros = dict() + libraries = [] diff --git a/lang/python27/patches/patch-zz-minix-h b/lang/python27/patches/patch-zz-minix-h new file mode 100644 index 000000000..eb25a576c --- /dev/null +++ b/lang/python27/patches/patch-zz-minix-h @@ -0,0 +1,47 @@ +--- configure.orig Tue Apr 28 06:43:45 2015 ++++ configure Tue Apr 28 06:45:35 2015 +@@ -5359,7 +5359,7 @@ + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*|MirBSD*) ++ Linux*|GNU*|Minix*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*|MirBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +@@ -8288,7 +8288,7 @@ + MirBSD*) + LDSHARED='$(CC) -shared $(CCSHARED)' + LDCXXSHARED='$(CXX) -shared $(CCSHARED)';; +- NetBSD*|DragonFly*) ++ Minix*|NetBSD*|DragonFly*) + LDSHARED='$(CC) -shared' + LDCXXSHARED='$(CXX) -shared';; + OpenUNIX*|UnixWare*) +@@ -8334,7 +8334,7 @@ + fi;; + Linux*|GNU*) CCSHARED="-fPIC";; + BSD/OS*/4*) CCSHARED="-fpic";; +- FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";; ++ FreeBSD*|Minix*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";; + Interix*) CCSHARED="";; + OpenUNIX*|UnixWare*) + if test "$GCC" = "yes" +@@ -8387,7 +8387,7 @@ + OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; + SCO_SV*) LINKFORSHARED="-Wl,-Bexport";; + ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; +- FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) ++ FreeBSD*|Minix*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) + if [ "`$CC -dM -E -