From a7e49eb2af5d2ca6e53fb908fddfddd92696910a Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 10 Aug 2007 19:07:51 +0000 Subject: Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't quite work yet for me, but this clearly is a huge project and not having it quite work on the first pass is hardly unexpected. We definately want this stuff in buildroot. --- package/x11r7/xlib_liblbxutil/Config.in | 7 ++++ .../xlib_liblbxutil-1.0.1-mkg3states.patch | 37 ++++++++++++++++++++++ package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk | 15 +++++++++ 3 files changed, 59 insertions(+) create mode 100644 package/x11r7/xlib_liblbxutil/Config.in create mode 100644 package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch create mode 100644 package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk (limited to 'package/x11r7/xlib_liblbxutil') diff --git a/package/x11r7/xlib_liblbxutil/Config.in b/package/x11r7/xlib_liblbxutil/Config.in new file mode 100644 index 000000000..97d264ccc --- /dev/null +++ b/package/x11r7/xlib_liblbxutil/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_XLIB_LIBLBXUTIL + bool "liblbxutil" + default n + select BR2_PACKAGE_XPROTO_XEXTPROTO + help + liblbxutil 1.0.1 + X.Org lbxutil library diff --git a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch new file mode 100644 index 000000000..9a35ac221 --- /dev/null +++ b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch @@ -0,0 +1,37 @@ +--- liblbxutil-1.0.1/configure.ac.orig 2007-06-08 21:57:50.000000000 +0200 ++++ liblbxutil-1.0.1/configure.ac 2007-06-08 21:58:06.000000000 +0200 +@@ -49,6 +49,15 @@ + + XORG_RELEASE_VERSION + ++AC_MSG_CHECKING([for CC_FOR_BUILD]) ++if test x$host != x$build ; then ++ CC_FOR_BUILD=${CC_FOR_BUILD-gcc} ++else ++ CC_FOR_BUILD=${CC} ++fi ++AC_MSG_RESULT([$CC_FOR_BUILD]) ++AC_SUBST(CC_FOR_BUILD) ++ + AC_OUTPUT([Makefile + src/Makefile + lbxutil.pc]) +--- liblbxutil-1.0.1/src/Makefile.am.orig 2007-06-08 21:57:50.000000000 +0200 ++++ liblbxutil-1.0.1/src/Makefile.am 2007-06-08 22:00:24.000000000 +0200 +@@ -5,6 +5,16 @@ + mkg3states_SOURCES = \ + $(srcdir)/image/mkg3states.c + ++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) ++LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ ++ ++$(srcdir)/mkg3states.o: ++ $(COMPILE) -c $< -o $@ ++ ++$(srcdir)/mkg3states: $(srcdir)/mkg3states.o ++ $(LINK) $< -o $@ ++ + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ + $(srcdir)/lbx_zlib/lbx_zlib_io.c \ diff --git a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk new file mode 100644 index 000000000..2f505c4c5 --- /dev/null +++ b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# xlib_liblbxutil -- X.Org lbxutil library +# +################################################################################ + +XLIB_LIBLBXUTIL_VERSION = 1.0.1 +XLIB_LIBLBXUTIL_SOURCE = liblbxutil-$(XLIB_LIBLBXUTIL_VERSION).tar.bz2 +XLIB_LIBLBXUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBLBXUTIL_AUTORECONF = YES +XLIB_LIBLBXUTIL_INSTALL_STAGING = YES +XLIB_LIBLBXUTIL_DEPENDANCIES = xproto_xextproto +XLIB_LIBLBXUTIL_CONF_OPT = --enable-shared --disable-static + +$(eval $(call AUTOTARGETS,xlib_liblbxutil)) -- cgit v1.2.3