From 612f8cbab4b40867fb94f36283af0a00a4af9b88 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 23:45:53 +0200 Subject: fix x11 compile and other stuff - fix uclibc libx11 compile - fix empty banner - fix rdate init script --- package/libX11/patches/patch-src_util_Makefile_in | 18 +++++++++++++++--- package/libX11/patches/patch-src_util_Makefile_in.orig | 12 ------------ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 package/libX11/patches/patch-src_util_Makefile_in.orig (limited to 'package/libX11/patches') diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in index 3a5366af1..9d27c162e 100644 --- a/package/libX11/patches/patch-src_util_Makefile_in +++ b/package/libX11/patches/patch-src_util_Makefile_in @@ -1,6 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- libX11-1.1.5.orig/src/util/Makefile.in 2008-09-04 23:48:56.000000000 +0200 -+++ libX11-1.1.5/src/util/Makefile.in 2008-12-22 13:41:42.000000000 +0100 ++++ libX11-1.1.5/src/util/Makefile.in 2009-05-30 21:53:42.350425696 +0200 +@@ -52,7 +52,7 @@ makekeys_OBJECTS = makekeys-makekeys.$(O + makekeys_LDADD = $(LDADD) + makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ $(HOSTLDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles @@ -82,7 +82,7 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@ BIGFONT_LIBS = @BIGFONT_LIBS@ CC = @CC@ @@ -10,9 +19,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ -@@ -229,7 +229,7 @@ top_builddir = @top_builddir@ +@@ -227,9 +227,9 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - makekeys_CFLAGS = $(X11_CFLAGS) +-makekeys_CFLAGS = $(X11_CFLAGS) ++makekeys_CFLAGS = $(HOSTCFLAGS) -#override CC = gcc +override CC = gcc diff --git a/package/libX11/patches/patch-src_util_Makefile_in.orig b/package/libX11/patches/patch-src_util_Makefile_in.orig deleted file mode 100644 index fb4885f40..000000000 --- a/package/libX11/patches/patch-src_util_Makefile_in.orig +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libX11-1.1.5.orig/src/util/Makefile.in 2008-09-04 23:48:56.000000000 +0200 -+++ libX11-1.1.5/src/util/Makefile.in 2008-12-22 13:39:31.000000000 +0100 -@@ -229,7 +229,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - makekeys_CFLAGS = $(X11_CFLAGS) - --#override CC = gcc -+override CC = gcc - LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - EXTRA_DIST = mkks.sh - -- cgit v1.2.3