From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 7 Feb 2010 14:54:51 +0000 (+0100)
Subject: readline: Copy patch files into repository.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3869516ac94a802aa73d768263a6bbd35d2809fc;p=ipfire-3.x.git

readline: Copy patch files into repository.
---

diff --git a/pkgs/core/readline/patches/readline-6.0-shlib-1.patch b/pkgs/core/readline/patches/readline-6.0-shlib-1.patch
new file mode 100644
index 000000000..f97fa17fb
--- /dev/null
+++ b/pkgs/core/readline/patches/readline-6.0-shlib-1.patch
@@ -0,0 +1,38 @@
+--- readline-5.2/support/shlib-install.shlib	2006-01-03 20:06:27.000000000 +0100
++++ readline-5.2/support/shlib-install	2006-11-13 13:51:02.000000000 +0100
+@@ -71,7 +71,7 @@
+ case "$host_os" in
+ hpux*|darwin*|macosx*|linux*)
+ 	if [ -z "$uninstall" ]; then
+-		chmod 555 ${INSTALLDIR}/${LIBNAME}
++		chmod 755 ${INSTALLDIR}/${LIBNAME}
+ 	fi ;;
+ cygwin*)
+ 	IMPLIBNAME=`echo ${LIBNAME} \
+--- readline-5.2/support/shobj-conf.shlib	2006-04-11 15:15:43.000000000 +0200
++++ readline-5.2/support/shobj-conf	2007-03-15 14:11:36.000000000 +0100
+@@ -108,10 +108,11 @@
+ linux*-*|gnu*-*|k*bsd*-gnu-*)
+ 	SHOBJ_CFLAGS=-fPIC
+ 	SHOBJ_LD='${CC}'
+-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
++	SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@'
+ 
+-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
++	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
++	SHLIB_LIBS='-ltinfo'
+ 	;;
+ 
+ freebsd2* | netbsd*)
+--- readline-5.2/shlib/Makefile.in.shlib	2005-08-12 05:56:10.000000000 +0200
++++ readline-5.2/shlib/Makefile.in	2007-11-05 18:59:14.000000000 +0100
+@@ -168,7 +168,7 @@ $(SHARED_READLINE):	$(SHARED_OBJ)
+ 
+ $(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so
+ 	$(RM) $@
+-	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
++	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so
+ 
+ # Since tilde.c is shared between readline and bash, make sure we compile 
+ # it with the right flags when it's built as part of readline
diff --git a/pkgs/core/readline/readline.nm b/pkgs/core/readline/readline.nm
index 1a54fd0c2..f31437787 100644
--- a/pkgs/core/readline/readline.nm
+++ b/pkgs/core/readline/readline.nm
@@ -47,8 +47,6 @@ endef
 
 PKG_TARBALL    = $(THISAPP).tar.gz
 
-PKG_PATCHES   += $(THISAPP)-shlib-1.patch
-
 ###############################################################################
 # Installation Details
 ###############################################################################