summaryrefslogtreecommitdiff
path: root/data/python/bundle.diff
blob: c7f38b9868c874e926b9875df42abf65f27b169e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
diff -r -u Python-2.5.1/configure.in Python-2.5.1+iPhone/configure.in
--- Python-2.5.1/configure.in	2007-03-12 10:50:51.000000000 +0000
+++ Python-2.5.1+iPhone/configure.in	2008-01-09 11:45:20.000000000 +0000
@@ -1484,7 +1484,12 @@
 			if test "${enable_universalsdk}"; then
 				LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
 			fi
-			LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+			LDSHARED='$(CC) $(LDFLAGS) -undefined dynamic_lookup'
+			if test "$enable_framework" ; then
+                                LDSHARED="$LDSHARED -bundle"
+			else
+                                LDSHARED="$LDSHARED -dynamiclib"
+                        fi
 			BLDSHARED="$LDSHARED"
 		else
 			LDSHARED='$(CC) $(LDFLAGS) -bundle'
diff -r -u Python-2.5.1/Makefile.pre.in Python-2.5.1+iPhone/Makefile.pre.in
--- Python-2.5.1/Makefile.pre.in	2006-12-08 20:46:13.000000000 +0000
+++ Python-2.5.1+iPhone/Makefile.pre.in	2008-01-09 12:00:36.000000000 +0000
@@ -362,9 +362,9 @@
 	$(AR) cr $@ $(MODOBJS)
 	$(RANLIB) $@
 
-libpython$(VERSION).so: $(LIBRARY_OBJS)
+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
 	if test $(INSTSONAME) != $(LDLIBRARY); then \
-		$(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
+		$(LDSHARED) -Wl,-dylib_install_name,$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
 		$(LN) -f $(INSTSONAME) $@; \
 	else\
 		$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \