Attachment #7539 for issue #16420

View | Details | Raw Unified | Return to issue 16420
Collapse All | Expand All




.IF "$(GUI)" == "UNX"
CONFIGURE_ACTION= ./configure --prefix=../python-inst
BUILD_ACTION=make ; make install
.IF "$(OS)"=="MACOSX"
PYTHONCORESHL=$(OUT)$/lib$/$(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST)
PYTHONCORELINK1=$(OUT)$/lib$/$(DLLPRE)python$(PYMAJOR)$(DLLPOST)
PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)
.ELSE
PYTHONCORESHL=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST).$(PYVERSION)
PYTHONCORELINK1=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST).$(PYMAJOR)
PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)
.ENDIF
.ELSE
BUILD_DIR=PCBuild
.IF "$(COMEX)"=="8"

#.ENDIF

.IF "$(GUI)" == "UNX"
$(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
# Just to get the dependency right for SMP builds
	@echo nothing do do

$(PYTHONCORESHL) : $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a makefile.mk 
.IF "$(OS)" == "SOLARIS"
	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a -h $(DLLPRE)python.so.$(PYMAJOR) -lm -ldl -lc -lpthread
.ELSE
	echo "$(OS)"
	.IF "$(OS)" == "MACOSX"
		cp $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR)$(DLLPOST) $(OUT)$/lib
	.ELSE
		ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname $(DLLPRE)python.$(DLLPOST).$(PYMAJOR)  -lm -ldl -lutil -lc -lpthread
	.ENDIF
.ENDIF

$(PYTHONCORELINK1) : makefile.mk $(PYTHONCORESHL)
	-rm -f $@
.IF "$(OS)" == "MACOSX"
	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(PYMAJOR).$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(PYMAJOR)$(DLLPOST)
.ELSE
	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST).$(PYMAJOR)
.ENDIF

$(PYTHONCORELINK2) : makefile.mk $(PYTHONCORESHL)
	-rm -f $@
.IF "$(OS)" == "MACOSX"
	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(PYMAJOR).$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(DLLPOST)
.ELSE
	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)
.ENDIF
.ENDIF

$(PYVERSIONFILE) : pyversion.mk

Lines 51-56 Link Here

(-)prj/d.lst (+1 lines)
51	..\%__SRC%\misc\build\python-inst\lib\python2.2\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*	51	..\%__SRC%\misc\build\python-inst\lib\python2.2\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
52	..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python	52	..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
53	..\%__SRC%\lib\libpython.so.2.2.2 %_DEST%\lib%_EXT%\libpython.so.2.2.2	53	..\%__SRC%\lib\libpython.so.2.2.2 %_DEST%\lib%_EXT%\libpython.so.2.2.2
		54	..\%__SRC%\lib\libpython.dylib %_DEST%\lib%_EXT%\libpython.dylib
54		55
55	# WINDOWS ONLY !	56	# WINDOWS ONLY !
56	..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h	57	..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h

Return to issue 16420

Lines 80-88 Link Here

(-)makefile.mk (-9 / +27 lines)
80	.IF "$(GUI)" == "UNX"	80	.IF "$(GUI)" == "UNX"
81	CONFIGURE_ACTION= ./configure --prefix=../python-inst	81	CONFIGURE_ACTION= ./configure --prefix=../python-inst
82	BUILD_ACTION=make ; make install	82	BUILD_ACTION=make ; make install
83	PYTHONCORESHL=$(OUT)$/lib$/libpython.so.$(PYVERSION)	83	.IF "$(OS)"=="MACOSX"
84	PYTHONCORELINK1=$(OUT)$/lib$/libpython.so.$(PYMAJOR)	84	PYTHONCORESHL=$(OUT)$/lib$/$(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST)
85	PYTHONCORELINK2=$(OUT)$/lib$/libpython.so	85	PYTHONCORELINK1=$(OUT)$/lib$/$(DLLPRE)python$(PYMAJOR)$(DLLPOST)
		86	PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)
		87	.ELSE
		88	PYTHONCORESHL=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST).$(PYVERSION)
		89	PYTHONCORELINK1=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST).$(PYMAJOR)
		90	PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)
		91	.ENDIF
86	.ELSE	92	.ELSE
87	BUILD_DIR=PCBuild	93	BUILD_DIR=PCBuild
88	.IF "$(COMEX)"=="8"	94	.IF "$(COMEX)"=="8"
Lines 139-163 Link Here
139	#.ENDIF	145	#.ENDIF
140		146
141	.IF "$(GUI)" == "UNX"	147	.IF "$(GUI)" == "UNX"
142	$(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)	148	$(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
143	# Just to get the dependency right for SMP builds	149	# Just to get the dependency right for SMP builds
144	@echo nothing do do	150	@echo nothing do do
145		151
146	$(PYTHONCORESHL) : $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a makefile.mk	152	$(PYTHONCORESHL) : $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a makefile.mk
147	.IF "$(OS)" == "SOLARIS"	153	.IF "$(OS)" == "SOLARIS"
148	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread	154	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a -h $(DLLPRE)python.so.$(PYMAJOR) -lm -ldl -lc -lpthread
149	.ELSE	155	.ELSE
150	echo "$(OS)"	156	echo "$(OS)"
151	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	157	.IF "$(OS)" == "MACOSX"
		158	cp $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR)$(DLLPOST) $(OUT)$/lib
		159	.ELSE
		160	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname $(DLLPRE)python.$(DLLPOST).$(PYMAJOR) -lm -ldl -lutil -lc -lpthread
		161	.ENDIF
152	.ENDIF	162	.ENDIF
153		163
154	$(PYTHONCORELINK1) : makefile.mk $(PYTHONCORESHL)	164	$(PYTHONCORELINK1) : makefile.mk $(PYTHONCORESHL)
155	-rm -f $@	165	-rm -f $@
156	cd $(OUT)$/lib && ln -s libpython.so.$(PYVERSION) libpython.so.$(PYMAJOR)	166	.IF "$(OS)" == "MACOSX"
		167	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(PYMAJOR).$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(PYMAJOR)$(DLLPOST)
		168	.ELSE
		169	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST).$(PYMAJOR)
		170	.ENDIF
157		171
158	$(PYTHONCORELINK2) : makefile.mk $(PYTHONCORESHL)	172	$(PYTHONCORELINK2) : makefile.mk $(PYTHONCORESHL)
159	-rm -f $@	173	-rm -f $@
160	cd $(OUT)$/lib && ln -s libpython.so.$(PYVERSION) libpython.so	174	.IF "$(OS)" == "MACOSX"
		175	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(PYMAJOR).$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(DLLPOST)
		176	.ELSE
		177	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)
		178	.ENDIF
161	.ENDIF	179	.ENDIF
162		180
163	$(PYVERSIONFILE) : pyversion.mk	181	$(PYVERSIONFILE) : pyversion.mk