49 lines
1.8 KiB
Text
49 lines
1.8 KiB
Text
$NetBSD: patch-ah,v 1.6 2005/03/07 12:11:49 dmcmahill Exp $
|
|
|
|
--- Makefile.pre.in.orig 2005-01-11 08:48:52.000000000 -0500
|
|
+++ Makefile.pre.in 2005-03-07 06:41:33.425152000 -0500
|
|
@@ -57,5 +57,5 @@
|
|
BASECFLAGS= @BASECFLAGS@
|
|
CFLAGS= $(BASECFLAGS) $(OPT)
|
|
-CPPFLAGS= -I. -I$(srcdir)/Include
|
|
+CPPFLAGS+= @CPPFLAGS@ -I. -I$(srcdir)/Include
|
|
LDFLAGS= @LDFLAGS@
|
|
LDLAST= @LDLAST@
|
|
@@ -309,5 +309,5 @@
|
|
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
|
|
Modules/$(MAINOBJ) \
|
|
- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
|
+ $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
|
|
|
|
platform: $(BUILDPYTHON)
|
|
@@ -349,8 +349,8 @@
|
|
libpython$(VERSION).so: $(LIBRARY_OBJS)
|
|
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
|
- $(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
|
|
+ $(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(LDFLAGS) $(SHLIBS) $(LIBC) $(LIBM); \
|
|
$(LN) -f $(INSTSONAME) $@; \
|
|
else\
|
|
- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
|
|
+ $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LDFLAGS) $(SHLIBS) $(LIBC) $(LIBM); \
|
|
fi
|
|
|
|
@@ -358,4 +358,7 @@
|
|
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
|
|
|
|
+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
|
|
+ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.3.4 -compatibility_version 2.3 -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
|
|
+
|
|
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
|
|
# minimal framework (not including the Lib directory and such) in the current
|
|
@@ -617,5 +620,10 @@
|
|
fi \
|
|
fi; \
|
|
- else true; \
|
|
+ else \
|
|
+ if test -f libpython$(VERSION).dylib; then \
|
|
+ $(INSTALL_SHARED) libpython$(VERSION).dylib $(DESTDIR)$(LIBDIR)/libpython$(VERSION).dylib; \
|
|
+ else \
|
|
+ true; \
|
|
+ fi \
|
|
fi
|
|
|