diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 11:44:38 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 11:44:38 +0100 |
commit | e3df24d64a48aff19aa9960dd9308a071b243b09 (patch) | |
tree | 8388488845af74f3834fd124995d47d21407c388 /recipes/xorg-lib/liblbxutil | |
parent | 5f254f7a424f04da9d68ed78b022dd590443cc3e (diff) | |
parent | 5ff293416fd38957ff883f2abaca5fa0438fab39 (diff) | |
download | openembedded-e3df24d64a48aff19aa9960dd9308a071b243b09.tar.gz |
Merge remote branch 'origin/martin_jansa/xorg-7.5' into shr/merge
Diffstat (limited to 'recipes/xorg-lib/liblbxutil')
-rw-r--r-- | recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch b/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch new file mode 100644 index 0000000000..f9f4a6382c --- /dev/null +++ b/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch @@ -0,0 +1,55 @@ +diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac +--- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 23:52:04.000000000 +0100 ++++ liblbxutil-1.1.0/configure.ac 2009-12-16 10:45:00.000000000 +0100 +@@ -50,4 +50,5 @@ + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am +--- liblbxutil-1.1.0.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ liblbxutil-1.1.0/src/image/Makefile.am 2009-12-16 10:45:00.000000000 +0100 +@@ -0,0 +1,15 @@ ++# evil hack ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ ++CC=$(CC_FOR_BUILD) ++LIBTOOL = @LIBTOOL@ --tag=CC ++ ++noinst_PROGRAMS = mkg3states ++ ++mkg3states_SOURCES = \ ++ mkg3states.c ++ ++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) ++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) +diff -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am +--- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-16 10:48:11.000000000 +0100 ++++ liblbxutil-1.1.0/src/Makefile.am 2009-12-16 10:46:47.000000000 +0100 +@@ -3,10 +3,7 @@ + AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS) + INCLUDES = -I$(top_srcdir)/include + +-noinst_PROGRAMS = mkg3states +- +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c ++SUBDIRS = image + + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ +@@ -38,9 +35,8 @@ + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states +- -rm -f g3states.h +- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++g3states.h: image/mkg3states ++ $(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + + liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined + |