diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-04-27 12:52:27 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-27 12:52:27 +0000 |
| commit | 13292396f6a67864b93088dd6e5db5a33889887d (patch) | |
| tree | c1d0a14335eeb0e4e91524a2e1674e7862be5138 | |
| parent | ff298281a111f10b05a35cb9322343e4c4f30a48 (diff) | |
liblbxutils: start merging stuff from #870
| -rw-r--r-- | packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/xlibs/liblbxutil-1.0.0/mkg3states.patch | 51 | ||||
| -rw-r--r-- | packages/xlibs/liblbxutil_1.0.0.bb | 19 |
3 files changed, 70 insertions, 0 deletions
diff --git a/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty b/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty diff --git a/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch b/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch new file mode 100644 index 0000000000..58463db46b --- /dev/null +++ b/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch @@ -0,0 +1,51 @@ +--- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500 ++++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500 +@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +--- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500 ++++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500 +@@ -1,9 +1,6 @@ + lib_LTLIBRARIES = liblbxutil.la + +-noinst_PROGRAMS = mkg3states +- +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c ++SUBDIRS = image + + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ +@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@ + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states +- -rm -f g3states.h +- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++g3states.h: image/mkg3states ++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + + liblbxutil_la_LDFLAGS = -version-number 1:0:0 + +--- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500 ++++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500 +@@ -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 --git a/packages/xlibs/liblbxutil_1.0.0.bb b/packages/xlibs/liblbxutil_1.0.0.bb new file mode 100644 index 0000000000..4edaa71ba4 --- /dev/null +++ b/packages/xlibs/liblbxutil_1.0.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "xextproto" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2 \ + file://mkg3states.patch;patch=1" + +inherit autotools pkgconfig + +export CC_FOR_BUILD = "${BUILD_CC}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" + +do_stage() { + autotools_stage_all +} |