Attachment #76162 for issue #117494

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

Lines 100-106 Link Here

(-)workdir/curl/makefile.mk.orig (-1 / +1 lines)
100	BUILD_DIR=$(CONFIGURE_DIR)$/lib	100	BUILD_DIR=$(CONFIGURE_DIR)$/lib
101	BUILD_ACTION=make	101	BUILD_ACTION=make
102	OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll	102	OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll
103	OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a	103	OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.dll.a
104	.ELSE	104	.ELSE
105	# make use of stlport headerfiles	105	# make use of stlport headerfiles
106	EXT_USE_STLPORT=TRUE	106	EXT_USE_STLPORT=TRUE

Lines 99-105 Link Here

(-)workdir/RepositoryFixes.mk.orig (-1 lines)
99	gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))	99	gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
100		100
101	gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))	101	gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
102	gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES))
103	gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))	102	gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
104	gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))	103	gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
105	gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))	104	gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))




.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
JVMACCESSLIB = -ljvmaccess$(COMID)
.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
.IF "$(OS)" == "WNT"
CPPUNITLIB = -lcygcppunit-1-12-1
.ELSE
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CPPUNITLIB = $(CPPUNIT_LIBS)
.ELSE
CPPUNITLIB = -lcppunit
.ENDIF
.ENDIF
.IF "$(SYSTEM_LIBXSLT)"=="YES"
XSLTLIB=$(LIBXSLT_LIBS)
.ELSE

Return to issue 117494

Lines 265-279 Link Here

(-)workdir/solenv/inc/libs.mk.orig (-4 lines)
265	.ELSE # "$(GUI)$(COM)"=="WNTGCC"	265	.ELSE # "$(GUI)$(COM)"=="WNTGCC"
266	JVMACCESSLIB = -ljvmaccess$(COMID)	266	JVMACCESSLIB = -ljvmaccess$(COMID)
267	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"	267	.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
268	.IF "$(OS)" == "WNT"
269	CPPUNITLIB = -lcygcppunit-1-12-1
270	.ELSE
271	.IF "$(SYSTEM_CPPUNIT)"=="YES"	268	.IF "$(SYSTEM_CPPUNIT)"=="YES"
272	CPPUNITLIB = $(CPPUNIT_LIBS)	269	CPPUNITLIB = $(CPPUNIT_LIBS)
273	.ELSE	270	.ELSE
274	CPPUNITLIB = -lcppunit	271	CPPUNITLIB = -lcppunit
275	.ENDIF	272	.ENDIF
276	.ENDIF
277	.IF "$(SYSTEM_LIBXSLT)"=="YES"	273	.IF "$(SYSTEM_LIBXSLT)"=="YES"
278	XSLTLIB=$(LIBXSLT_LIBS)	274	XSLTLIB=$(LIBXSLT_LIBS)
279	.ELSE	275	.ELSE