summaryrefslogtreecommitdiff
path: root/data/python/bundle.diff
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2008-01-09 22:21:43 +0000
committerJay Freeman <saurik@saurik.com>2008-01-09 22:21:43 +0000
commit35ef70353227e4dff60fc36437f08293be752b25 (patch)
tree806d29fe3d68433a1c971336dff58863918b2709 /data/python/bundle.diff
parent03880b546d794abafd6dab3eed876dbefe06c174 (diff)
Factored out --enable-{static=no,shared=yes}, did some extreme porting on pkg-config and libtool, added support for numerous X libraries and a few X applications, and got a solid build of Python with a bunch of modules (compiled as a shared library with the right extensions ;P).
git-svn-id: http://svn.telesphoreo.org/trunk@12 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'data/python/bundle.diff')
-rw-r--r--data/python/bundle.diff32
1 files changed, 32 insertions, 0 deletions
diff --git a/data/python/bundle.diff b/data/python/bundle.diff
new file mode 100644
index 000000000..c7f38b986
--- /dev/null
+++ b/data/python/bundle.diff
@@ -0,0 +1,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); \