incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1296423 - in /incubator/ooo/trunk/main: RepositoryFixes.mk svtools/Library_svt.mk tools/Library_tl.mk
Date Fri, 02 Mar 2012 20:00:58 GMT
Author: ydario
Date: Fri Mar  2 20:00:58 2012
New Revision: 1296423

URL: http://svn.apache.org/viewvc?rev=1296423&view=rev
Log:
i118923 - OS/2 port: gbuild system minor fixes and cleanup.

Modified:
    incubator/ooo/trunk/main/RepositoryFixes.mk
    incubator/ooo/trunk/main/svtools/Library_svt.mk
    incubator/ooo/trunk/main/tools/Library_tl.mk

Modified: incubator/ooo/trunk/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/RepositoryFixes.mk?rev=1296423&r1=1296422&r2=1296423&view=diff
==============================================================================
--- incubator/ooo/trunk/main/RepositoryFixes.mk (original)
+++ incubator/ooo/trunk/main/RepositoryFixes.mk Fri Mar  2 20:00:58 2012
@@ -167,7 +167,6 @@ endif
 endif
 
 ifeq ($(OS),OS2)
-#gb_Library_FILENAMES := $(patsubst basegfx:basegfx%,basegfx:ibasegfx%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelpgcc3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppu:cppu%,cppu:cppu3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:cppuhelper%,cppuhelper:cppuh3%,$(gb_Library_FILENAMES))
@@ -175,8 +174,6 @@ gb_Library_FILENAMES := $(patsubst cppun
 gb_Library_FILENAMES := $(patsubst cui:iicuc%,cui:icuc%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:i18nisolang1%,i18nisolang1:i18nisolang1gcc3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nutil:i18nutil%,i18nutil:i18nutilgcc3%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst icule:iicule%,icule:icule%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst icuuc:iicuuc%,icuuc:icuuc%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess3gcc3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:jvmfwk%,jvmfwk:jvmfwk3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES))
@@ -195,7 +192,6 @@ gb_Library_FILENAMES := $(patsubst xo:ix
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:xml2%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst stl:stl%,stl:stdc++%,$(gb_Library_FILENAMES))
-#$(info libnames: $(gb_Library_FILENAMES))
 
 # translate to 8.3 naming
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
@@ -211,9 +207,14 @@ gb_Library_DLLFILENAMES := $(patsubst vb
 gb_Library_DLLFILENAMES := $(patsubst sfx:test_sfx2_metadatable%,sfx:tstsfx2m%,$(gb_Library_DLLFILENAMES))
 
 gb_Library_NOILIBFILENAMES:=\
+	ft2lib \
 	icuuc \
 	icule
 
+gb_Library_ILIBFILENAMES:=\
+	ft2lib \
+	uuid \
+
 endif
 
 ifeq ($(OS),SOLARIS)

Modified: incubator/ooo/trunk/main/svtools/Library_svt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/Library_svt.mk?rev=1296423&r1=1296422&r2=1296423&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/Library_svt.mk (original)
+++ incubator/ooo/trunk/main/svtools/Library_svt.mk Fri Mar  2 20:00:58 2012
@@ -76,6 +76,14 @@ $(eval $(call gb_Library_add_linked_libs
 $(eval $(call gb_Library_set_ldflags,svt,\
 	$$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
 ))
+ifeq ($(GUIBASE),os2)
+# YD FIXME above is not working... needs ldflags hack...
+$(eval $(call gb_Library_set_ldflags,svt,\
+    $$(LDFLAGS) \
+    -ljpeg \
+))
+endif
+
 else
 $(eval $(call gb_Library_add_linked_static_libs,svt,\
 	jpeglib \

Modified: incubator/ooo/trunk/main/tools/Library_tl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/Library_tl.mk?rev=1296423&r1=1296422&r2=1296423&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/Library_tl.mk (original)
+++ incubator/ooo/trunk/main/tools/Library_tl.mk Fri Mar  2 20:00:58 2012
@@ -142,6 +142,14 @@ $(eval $(call gb_Library_add_linked_stat
 ))
 endif
 
+ifeq ($(OS),OS2)
+# YD FIXME above is not working... needs ldflags hack...
+$(eval $(call gb_Library_set_ldflags,tl,\
+    $$(LDFLAGS) \
+    -lz \
+))
+endif
+
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Library_set_include,tl,\



Mime
View raw message