diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:49:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:49:34 +0200 |
| commit | 8a2754e0fbdea7497281327f2896be2a1253a107 (patch) | |
| tree | bc7c400745fde54e6fb7a010fcb026258564d3bc /package/libX11 | |
| parent | 9bd4456c5a83c3474fdf9fe5cf14004a0874e2c8 (diff) | |
| parent | 2d3aaf1664850031f5497e121dc82ab65f63641a (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libX11')
| -rw-r--r-- | package/libX11/Makefile | 7 | ||||
| -rw-r--r-- | package/libX11/patches/patch-src_util_Makefile_in | 18 | ||||
| -rw-r--r-- | package/libX11/patches/patch-src_util_Makefile_in.orig | 12 |
3 files changed, 18 insertions, 19 deletions
diff --git a/package/libX11/Makefile b/package/libX11/Makefile index b2c3ab1ff..4c6debf0c 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -7,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libX11 PKG_VERSION:= 1.1.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 2feb39a0de6f05b25c308268691d960c PKG_DESCR:= X11 client-side library PKG_SECTION:= x11 @@ -26,7 +24,8 @@ BUILD_STYLE= auto INSTALL_STYLE= auto confprog post-install: - ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib + ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 ${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/ + ${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11 include ${TOPDIR}/mk/pkg-bottom.mk 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 - |