mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mingw compile fixes for liblangtag

Browse Source 
I couldn't find out a decent way of getting the compiled binary
needed only at build time, so the file needs to be generated manually.

Change-Id: I4a77aa8ee350f374c9b8b91361797d86871ff8b4
This commit is contained in:
Luboš Luňák
2012-09-14 11:26:38 +02:00
parent 1126ecef09
commit 374abf3b5f
4 changed files with 45407 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45323
liblangtag/liblangtag-0.2-mingw-genfile.patch Normal file
View File

File diff suppressed because it is too large Load Diff

73
liblangtag/liblangtag-0.2-mingw.patch Normal file
View File

@@ -0,0 +1,73 @@
--- misc/build/liblangtag-0.2/Makefile.in.sav 2012-09-13 17:01:57.000000000 +0200
+++ misc/build/liblangtag-0.2/Makefile.in 2012-09-13 17:02:27.000000000 +0200
@@ -315,7 +315,7 @@ NULL =
AUTOMAKE_OPTIONS = dist-bzip2
#SUBDIRS += docs tests
-SUBDIRS = liblangtag data docs $(am__append_1) tests
+SUBDIRS = liblangtag data docs $(am__append_1)
CONFIGURE_DEPENDENCIES = \
requires \
$(NULL)
--- misc/build/liblangtag-0.2/liblangtag-gobject/Makefile.in.sav 2012-02-02 13:31:17.000000000 +0100
+++ misc/build/liblangtag-0.2/liblangtag-gobject/Makefile.in 2012-09-13 17:05:22.000000000 +0200
@@ -425,6 +425,7 @@ liblangtag_gobject_la_CFLAGS = \
liblangtag_gobject_la_LDFLAGS = \
$(LDFLAGS) \
-version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \
+ -no-undefined \
$(NULL)
#
--- misc/build/liblangtag-0.2/liblangtag-gobject/Makefile.am.sav 2012-02-02 13:31:15.000000000 +0100
+++ misc/build/liblangtag-0.2/liblangtag-gobject/Makefile.am 2012-09-13 17:05:05.000000000 +0200
@@ -137,6 +137,7 @@ liblangtag_gobject_la_CFLAGS = \
liblangtag_gobject_la_LDFLAGS = \
$(LDFLAGS) \
-version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \
+ -no-undefined \
$(NULL)
#
if HAVE_INTROSPECTION
--- misc/build/liblangtag-0.2/Makefile.am.sav 2012-09-13 17:01:57.000000000 +0200
+++ misc/build/liblangtag-0.2/Makefile.am 2012-09-13 17:02:27.000000000 +0200
@@ -7,7 +7,7 @@ SUBDIRS += liblangtag-gobject
endif
#SUBDIRS += docs tests
-SUBDIRS += tests
+#SUBDIRS += tests
ACLOCAL_AMFLAGS = \
-I m4macros \
--- misc/build/liblangtag-0.2/liblangtag/Makefile.in.sav 2012-02-02 11:04:10.000000000 +0100
+++ misc/build/liblangtag-0.2/liblangtag/Makefile.in 2012-09-13 17:04:35.000000000 +0200
@@ -487,6 +487,7 @@ liblangtag_la_CFLAGS = \
liblangtag_la_LDFLAGS = \
$(LDFLAGS) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -no-undefined \
$(NULL)
all: all-recursive
--- misc/build/liblangtag-0.2/liblangtag/Makefile.am.sav 2012-02-02 09:54:40.000000000 +0100
+++ misc/build/liblangtag-0.2/liblangtag/Makefile.am 2012-09-13 17:04:19.000000000 +0200
@@ -149,4 +149,5 @@ liblangtag_la_CFLAGS = \
liblangtag_la_LDFLAGS = \
$(LDFLAGS) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -no-undefined \
$(NULL)
--- misc/build/liblangtag-0.2/liblangtag/lt-ext-module.c.sav 2012-02-02 07:57:44.000000000 +0100
+++ misc/build/liblangtag-0.2/liblangtag/lt-ext-module.c 2012-09-13 17:33:24.000000000 +0200
@@ -584,8 +584,8 @@ lt_ext_modules_load(void)
gsize len;
while (1) {
- if (readdir_r(dir, &dent, &dresult) || dresult == NULL)
- break;
+/* if (readdir_r(dir, &dent, &dresult) || dresult == NULL)
+ break;*/ abort(); /* we do not use liblangtag-gobject anyway */
len = strlen(dent.d_name);
if (len > suffix_len &&

11
liblangtag/makefile.mk
View File

@@ -109,6 +109,10 @@ CONFIGURE_FLAGS+= LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
PATCH_FILES+=liblangtag-0.2-mingw.patch
# There's a tool used only at build time to create the .xml file, and this does not work
# with cross-compiling. The file for this case is from a normal (non-cross) build.
PATCH_FILES+=liblangtag-0.2-mingw-genfile.patch
.ENDIF
.ELSE # "$(COM)"=="GCC"
@@ -121,8 +125,13 @@ PATCH_FILES+=liblangtag-0.2-msc-configure.patch
OUT2INC += $(my_install_relative)/include/liblangtag/*
.IF "$(GUI)"=="WNT" && "$(COM)"!="GCC"
.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
OUT2BIN += $(my_install_relative)/bin/liblangtag-0.dll
OUT2LIB += $(my_install_relative)/lib/liblangtag.dll.a
.ELSE
OUT2LIB += $(my_install_relative)/lib/langtag.lib*
.ENDIF
.ELSE
.IF "$(OS)" == "MACOSX"
OUT2LIB += $(my_install_relative)/lib/liblangtag*.dylib

1
liblangtag/prj/d.lst
View File

@@ -4,6 +4,7 @@ mkdir: %_DEST%\inc\liblangtag
..\%__SRC%\lib\liblangtag.so* %_DEST%\lib\
..\%__SRC%\lib\langtag.lib* %_DEST%\lib\
..\%__SRC%\lib\liblangtag*.dylib %_DEST%\lib\
..\%__SRC%\lib\liblangtag.dll.a %_DEST%\lib\
..\%__SRC%\misc\liblangtag_data.zip %_DEST%\pck\
symlink: %_DEST%\lib\liblangtag.so.0.1.0 %_DEST%\lib\liblangtag.so.0