SF.net SVN: gar:[22766] csw/mgar/pkg/libedit/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22766
          http://sourceforge.net/p/gar/code/22766
Author:   dmichelsen
Date:     2014-01-01 16:49:14 +0000 (Wed, 01 Jan 2014)
Log Message:
-----------
libedit/trunk: Final fixes, but the version I packages is the old version

Modified Paths:
--------------
    csw/mgar/pkg/libedit/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libedit/trunk/files/0001-Honour-LDFLAGS.patch

Property Changed:
----------------
    csw/mgar/pkg/libedit/trunk/

Index: csw/mgar/pkg/libedit/trunk
===================================================================
--- csw/mgar/pkg/libedit/trunk	2013-12-31 13:56:49 UTC (rev 22765)
+++ csw/mgar/pkg/libedit/trunk	2014-01-01 16:49:14 UTC (rev 22766)

Property changes on: csw/mgar/pkg/libedit/trunk
___________________________________________________________________
Modified: svn:ignore
## -1,4 +1 ##
-cookies
-download
 work
-
Modified: csw/mgar/pkg/libedit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libedit/trunk/Makefile	2013-12-31 13:56:49 UTC (rev 22765)
+++ csw/mgar/pkg/libedit/trunk/Makefile	2014-01-01 16:49:14 UTC (rev 22766)
@@ -1,6 +1,5 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
-# ! Installation needs to be relocated to DESTDIR by using INSTALL_OVERRIDE_VARS
 # ! Linkage of libedit.so needs a SONAME, probably libedit.so.1
 # ! Package creation is missing
 
@@ -17,20 +16,40 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
 PATCHFILES += 0001-Add-definition-for-sig_t.patch
+PATCHFILES += 0001-Honour-LDFLAGS.patch
 
+PACKAGES += CSWlibedit1
+SPKG_DESC_CSWlibedit1 = Non-GPL replacement for readline library
+PKGFILES_CSWlibedit1 += $(call pkgfiles_lib,libedit.so.1)
+
+PACKAGES += CSWlibedit-dev
+SPKG_DESC_CSWlibedit-dev = Development files to libedit.so.1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibedit-dev += CSWlibedit1
+
 BUILD64_LIBS_ONLY = 1
 
 # The vis.h is completely different what libedit expects
 EXTRA_CONFIGURE_ENV += ac_cv_header_vis_h=no
 
 EXTRA_CFLAGS += $(CPPFLAGS)
+EXTRA_CFLAGS += -Kpic
 EXTRA_INC += $(includedir)/ncurses
 
 CONFIGURE_ARGS += $(DIRPATHS)
 
 TEST_TARGET = TEST
-TEST_OVERRIDE_VARS = LDADD
+TEST_OVERRIDE_VARS += LDADD
 TEST_OVERRIDE_VAR_LDADD = $(LDFLAGS)
 
+INSTALL_OVERRIDE_VARS += LIBDIR INCDIR MANDIR
+INSTALL_OVERRIDE_VAR_LIBDIR = $(DESTDIR)$(libdir)
+INSTALL_OVERRIDE_VAR_INCDIR = $(DESTDIR)$(includedir)
+INSTALL_OVERRIDE_VAR_MANDIR = $(DESTDIR)$(mandir)
+
 include gar/category.mk
 
+post-install:
+	cd $(DESTDIR)$(libdir) && mv libedit.so libedit.so.1
+	ln -s libedit.so.1 $(DESTDIR)$(libdir)/libedit.so
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/libedit/trunk/files/0001-Honour-LDFLAGS.patch
===================================================================
--- csw/mgar/pkg/libedit/trunk/files/0001-Honour-LDFLAGS.patch	                        (rev 0)
+++ csw/mgar/pkg/libedit/trunk/files/0001-Honour-LDFLAGS.patch	2014-01-01 16:49:14 UTC (rev 22766)
@@ -0,0 +1,25 @@
+From 647781bd34ae85a97a317f38c910bc355b8900c9 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 31 Dec 2013 17:35:27 +0100
+Subject: [PATCH] Honour LDFLAGS
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1bacf82..361bcf7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -100,7 +100,7 @@ libedit.a: ${OOBJS}
+ 	ar -r $@ ${OOBJS}
+ 
+ libedit.so: ${OOBJS}
+-	${CC} --shared -o $@ ${OOBJS}
++	${CC} $(LDFLAGS) -G -h libedit.so.1 -o $@ ${OOBJS}
+ 
+ # minimal dependency to make "make depend" optional
+ editline.o editline.po editline.so editline.ln:	\
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.