head 1.3; access; symbols pkgsrc-2019Q1:1.2.0.2 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.1.0.6 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.4 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.2 pkgsrc-2018Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2019.04.26.09.40.15; author roy; state dead; branches; next 1.2; commitid EcRxmo7B0v3XeQkB; 1.2 date 2019.03.02.13.23.35; author adam; state Exp; branches; next 1.1; commitid bE05IYSy7CP5eNdB; 1.1 date 2018.06.17.19.21.21; author adam; state Exp; branches; next ; commitid c6D8IR427LvRuFGA; desc @@ 1.3 log @Wave bye-bye to python34 and python35. Discussed on pkgsrc-users@@ @ text @$NetBSD: patch-configure,v 1.2 2019/03/02 13:23:35 adam Exp $ MirBSD support http://bugs.python.org/issue21458 Changes for consistency across pkgsrc platforms. Fix linking on Darwin; don't use -stack_size. detect netcan/can.h on NetBSD --- configure.orig 2018-08-02 09:18:47.000000000 +0000 +++ configure @@@@ -3369,7 +3369,7 @@@@ case $ac_sys_system/$ac_sys_release in # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. # In addition, Stefan Krah confirms that issue #1244610 exists through # OpenBSD 4.6, but is fixed in 4.7. - OpenBSD/2.* | OpenBSD/3.* | OpenBSD/4.[0123456]) + OpenBSD/2.* | OpenBSD/3.* | OpenBSD/4.[0123456] | MirBSD/*) define_xopen_source=no # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # also defined. This can be overridden by defining _BSD_SOURCE @@@@ -5650,15 +5650,10 @@@@ $as_echo "#define Py_ENABLE_SHARED 1" >> PY3LIBRARY=libpython3.so fi ;; - Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) + Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|MirBSD*) LDLIBRARY='libpython$(LDVERSION).so' BLDLIBRARY='-L. -lpython$(LDVERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - case $ac_sys_system in - FreeBSD*) - SOVERSION=`echo $SOVERSION|cut -d "." -f 1` - ;; - esac INSTSONAME="$LDLIBRARY".$SOVERSION if test "$with_pydebug" != yes then @@@@ -7283,7 +7278,7 @@@@ done # On Linux, can.h and can/raw.h require sys/socket.h -for ac_header in linux/can.h linux/can/raw.h linux/can/bcm.h +for ac_header in linux/can.h linux/can/raw.h linux/can/bcm.h netcan/can.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " @@@@ -8561,8 +8556,8 @@@@ then LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader - BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' - LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' + BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' + LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' fi ;; Darwin/*) @@@@ -8586,9 +8581,9 @@@@ then LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader - BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' - LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' - LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' + BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' + LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' + LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' fi else # building for OS X 10.3 and later @@@@ -8627,6 +8622,9 @@@@ then ;; esac fi;; + MirBSD*) + LDSHARED='$(CC) -shared $(CCSHARED)' + LDCXXSHARED='$(CXX) -shared $(CCSHARED)';; NetBSD*|DragonFly*) LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; @@@@ -8670,7 +8668,7 @@@@ then fi;; Linux*|GNU*) CCSHARED="-fPIC";; BSD/OS*/4*) CCSHARED="-fpic";; - FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; + FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";; OpenUNIX*|UnixWare*) if test "$GCC" = "yes" then CCSHARED="-fPIC" @@@@ -8709,7 +8707,6 @@@@ then # Issue #18075: the default maximum stack size (8MBytes) is too # small for the default recursion limit. Increase the stack size # to ensure that tests don't crash - LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED" if test "$enable_framework" then @@@@ -8719,7 +8716,7 @@@@ then OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; SCO_SV*) LINKFORSHARED="-Wl,-Bexport";; ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; - FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) + FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) if [ "`$CC -dM -E - &6; } case $ac_sys_system in - Linux*|GNU*) - EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};; *) EXT_SUFFIX=${SHLIB_SUFFIX};; esac @ 1.2 log @python3[4567]: find_library() fixes; remove -stack_size from LDFLAGS on Darwin. PkgSrc changes: * Make find_library() consitant for all Python versions: - Fallback to clang, when gcc is not installed. - Find libraries in PkgSrc prefix. * Do not use -stack_size; it ends up in 'pythonNN-config --ldflags', and some modules fail to build. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.1 2018/06/17 19:21:21 adam Exp $ @ 1.1 log @python: pkgsrc changes - Fix buidling curses (consistent across platforms) - Fix finding libraries with ctypes.util.find_library - Enable spwd module on Linux - Cleanup @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.6 2017/05/30 14:04:53 bouyer Exp $ d8 1 a8 1 XXX: Not sure what the BLDSHARED changes are about. d12 3 a14 3 --- configure.orig 2017-01-17 08:57:47.000000000 +0100 +++ configure 2017-05-30 15:49:43.508649775 +0200 @@@@ -3369,7 +3369,7 @@@@ d23 1 a23 1 @@@@ -5650,15 +5650,10 @@@@ d40 1 a40 1 @@@@ -7283,7 +7278,7 @@@@ d49 1 a49 1 @@@@ -8561,8 +8556,8 @@@@ d60 1 a60 1 @@@@ -8586,9 +8581,9 @@@@ d73 1 a73 1 @@@@ -8627,6 +8622,9 @@@@ d83 1 a83 1 @@@@ -8670,7 +8668,7 @@@@ d92 9 a100 1 @@@@ -8719,7 +8717,7 @@@@ d109 1 a109 1 @@@@ -14017,8 +14015,6 @@@@ @