diff options
| author | Kevin Hendricks <khendricks@openoffice.org> | 2003-05-18 12:30:34 +0000 |
|---|---|---|
| committer | Kevin Hendricks <khendricks@openoffice.org> | 2003-05-18 12:30:34 +0000 |
| commit | f08641980f766a7a8e2e47f39c5d48edf4431a82 (patch) | |
| tree | c2f63b0cc1ce129daf2ee0f6484b45bf1de60303 /python | |
| parent | 77512e657957c3e003abad46e3e11bc15b5c723b (diff) | |
fix to use --whole-archive --no-whole-archive matched pair
and to use the patch for PIC on ppc Linux
Diffstat (limited to 'python')
| -rw-r--r-- | python/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index 9f2b957503be..b1ea0890239b 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: mh $ $Date: 2003-03-31 14:07:18 $ +# last change: $Author: khendricks $ $Date: 2003-05-18 13:30:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,13 +71,14 @@ TARGET=so_python # --- Files -------------------------------------------------------- TARFILE_NAME=Python-$(PYVERSION) +PATCH_FILE_NAME=Python-$(PYVERSION).patch CONFIGURE_DIR= BUILD_DIR= .IF "$(GUI)" == "UNX" -CONFIGURE_ACTION=./configure --prefix=../python-inst +CONFIGURE_ACTION= ./configure --prefix=../python-inst BUILD_ACTION=make ; make install PYTHONCORESHL=$(OUT)$/lib$/libpython.so.$(PYVERSION) PYTHONCORELINK1=$(OUT)$/lib$/libpython.so.$(PYMAJOR) @@ -119,7 +120,7 @@ $(MISC)$/build$/pyconfig.h :$(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h $(PA .IF "$(GUI)" == "UNX" $(PYTHONCORESHL) : $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a makefile.mk $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) - ld -shared -o $@ -lm -ldl -lutil -lc -lpthread --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -soname libpython.so.$(PYMAJOR) + ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR) -lm -ldl -lutil -lc -lpthread $(PYTHONCORELINK1) : makefile.mk -rm -f $@ |