SF.net SVN: gar:[25302] csw/mgar/pkg/readline/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 25302
          http://sourceforge.net/p/gar/code/25302
Author:   dmichelsen
Date:     2015-10-19 12:51:46 +0000 (Mon, 19 Oct 2015)
Log Message:
-----------
readline/trunk: Remove obsoletion to *.so.4 as rdeps have been rebuild

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

Modified: csw/mgar/pkg/readline/trunk/Makefile
===================================================================
--- csw/mgar/pkg/readline/trunk/Makefile	2015-10-19 12:09:48 UTC (rev 25301)
+++ csw/mgar/pkg/readline/trunk/Makefile	2015-10-19 12:51:46 UTC (rev 25302)
@@ -21,13 +21,11 @@
 
 VENDOR_URL = http://tiswww.case.edu/php/chet/readline/rltop.html
 
-# From pkg/readline43
-FOREIGN_PACKAGES += CSWlibhistory4
-OBSOLETED_BY_CSWlibhistory4 = CSWreadline
-FOREIGN_PACKAGES += CSWlibreadline4
-OBSOLETED_BY_CSWlibreadline4 = CSWreadline
-
 # From pkg/readline52
+# The only packages left that depend on the CSWreadline stub to pull in libreadline.so.5 are
+# - CSWclisp
+# - CSWsqlite
+# Remove the obsoletion when the above packages have been rebuild
 FOREIGN_PACKAGES += CSWlibhistory5
 OBSOLETED_BY_CSWlibhistory5 = CSWreadline
 FOREIGN_PACKAGES += CSWlibreadline5
@@ -37,9 +35,6 @@
 CATALOGNAME_CSWlibhistory6 = libhistory6
 SPKG_DESC_CSWlibhistory6 = GNU readline library, libhistory.so.6
 PKGFILES_CSWlibhistory6 = $(call pkgfiles_lib,libhistory.so.6)
-# This dependency is not really necessary, just because we unconditionally add
-# "-lncurses" to LDFLAGS as this does not happen automatically.
-RUNTIME_DEP_PKGS_CSWlibhistory6 += CSWlibncurses5
 OBSOLETED_BY_CSWlibhistory6 = CSWreadline
 
 PACKAGES += CSWlibreadline6
@@ -56,17 +51,14 @@
 RUNTIME_DEP_PKGS_CSWlibreadline-dev += CSWlibhistory6
 RUNTIME_DEP_PKGS_CSWlibreadline-dev += CSWlibreadline6
 
+REINPLACE_USRLOCAL += examples/rl-fgets.c
+
 BUILD64_LIBS_ONLY = 1
 NORUNPATH = 1
 
-CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-curses
 
 include gar/category.mk
 
-post-install-modulated:
-	perl -pi -e 's,/usr/local/lib,$(libdir),' \
-		$(DESTDIR)/opt/csw/share/readline/rl-fgets.c
-	@$(MAKECOOKIE)
-
-LDFLAGS := $(filter-out -xarch=%,$(filter-out -m%,$(LDFLAGS))) -R$(libdir) -lncurses
+LDFLAGS := $(filter-out -xarch=%,$(filter-out -xchip=%,$(filter-out -m%,$(LDFLAGS)))) -R$(libdir) -lncurses

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