Fixup fromcvs/togit conversion
[pkgsrcv2.git] / lang / python25 / patches / patch-al
1 $NetBSD: patch-al,v 1.5 2009/04/11 19:42:23 snj Exp $
2
3 --- configure.orig      2011-09-07 15:28:20.710346391 +0200
4 +++ configure   2011-09-07 15:30:02.126868889 +0200
5 @@ -2058,10 +2058,10 @@ if test $define_xopen_source = yes
6  then
7    # On Solaris w/ g++ it appears that _XOPEN_SOURCE has to be
8    # defined precisely as g++ defines it
9 -  # Furthermore, on Solaris 10, XPG6 requires the use of a C99
10 +  # Furthermore, on Solaris >10, XPG6 requires the use of a C99
11    # compiler
12    case $ac_sys_system/$ac_sys_release in
13 -    SunOS/5.8|SunOS/5.9|SunOS/5.10)
14 +    SunOS/5.8|SunOS/5.9|SunOS/5.10|SunOS/5.11)
15  
16  cat >>confdefs.h <<\_ACEOF
17  #define _XOPEN_SOURCE 500
18 @@ -2081,10 +2081,10 @@ _ACEOF
19    # definition of _XOPEN_SOURCE_EXTENDED and _POSIX_C_SOURCE, or else
20    # several APIs are not declared. Since this is also needed in some
21    # cases for HP-UX, we define it globally.
22 -  # except for Solaris 10, where it must not be defined,
23 +  # except for Solaris >10, where it must not be defined,
24    # as it implies XPG4.2
25    case $ac_sys_system/$ac_sys_release in
26 -    SunOS/5.10)
27 +    SunOS/5.10|SunOS/5.11)
28        ;;
29      *)
30  
31 @@ -4014,17 +4014,18 @@ _ACEOF
32           RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
33           INSTSONAME="$LDLIBRARY".$SOVERSION
34            ;;
35 -    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
36 +    Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*)
37           LDLIBRARY='libpython$(VERSION).so'
38           BLDLIBRARY='-L. -lpython$(VERSION)'
39           RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
40 -         case $ac_sys_system in
41 -             FreeBSD*)
42 -               SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
43 -               ;;
44 -         esac
45           INSTSONAME="$LDLIBRARY".$SOVERSION
46           ;;
47 +    Darwin*)
48 +         LDLIBRARY='libpython$(VERSION).dylib'
49 +         BLDLIBRARY='-L. -lpython$(VERSION)'
50 +         RUNSHARED=DYLD_FALLBACK_LIBRARY_PATH=`pwd`:${DYLD_FALLBACK_LIBRARY_PATH}
51 +         INSTSONAME="$LDLIBRARY"
52 +         ;;
53      hp*|HP*)
54           case `uname -m` in
55                 ia64)
56 @@ -4534,7 +4535,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
57             ;;
58         # is there any other compiler on Darwin besides gcc?
59         Darwin*)
60 -           BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
61 +               if [[ `/usr/bin/arch` = 'ppc' ]]
62 +               then
63 +                       BASECFLAGS="$BASECFLAGS -no-cpp-precomp -mno-fused-madd -fno-common"
64 +               else
65 +                       BASECFLAGS="$BASECFLAGS -no-cpp-precomp -fno-common"
66 +               fi
67             if test "${enable_universalsdk}"; then
68                 BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
69             fi
70 @@ -11536,12 +11542,12 @@ then
71                                 LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
72                         else
73                                 # No framework, use the Python app as bundle-loader
74 -                               BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
75 -                               LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
76 +                               BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
77 +                               LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
78                         fi
79                 fi
80                 ;;
81 -       Linux*|GNU*) LDSHARED='$(CC) -shared';;
82 +       Linux*|GNU*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";;
83         BSD/OS*/4*) LDSHARED="gcc -shared";;
84         FreeBSD*)
85                 if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
86 @@ -11565,6 +11571,7 @@ then
87                                 esac
88                 fi;;
89         NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
90 +       Interix*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack
91         OpenUNIX*|UnixWare*)
92                 if test "$GCC" = "yes"
93                 then LDSHARED='$(CC) -shared'
94 @@ -11600,6 +11607,7 @@ then
95         Linux*|GNU*) CCSHARED="-fPIC";;
96         BSD/OS*/4*) CCSHARED="-fpic";;
97         FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
98 +       Interix*) CCSHARED="";;
99         OpenUNIX*|UnixWare*)
100                 if test "$GCC" = "yes"
101                 then CCSHARED="-fPIC"
102 @@ -11657,6 +11665,7 @@ then
103                 then
104                         LINKFORSHARED="-Wl,--export-dynamic"
105                 fi;;
106 +       Interix*) LINKFORSHARED="-Wl,-E";;
107         SunOS/5*) case $CC in
108                   *gcc*)
109                     if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null