[115687] trunk/dports/sysutils/rpm

[afb at macports.org]

Revision: 115687
          https://trac.macports.org/changeset/115687
Author:   afb at macports.org
Date:     2014-01-08 14:45:42 -0800 (Wed, 08 Jan 2014)
Log Message:
-----------
rpm: allow building with popt without la (#41697)

Modified Paths:
--------------
    trunk/dports/sysutils/rpm/Portfile
    trunk/dports/sysutils/rpm/files/patch-configure

Added Paths:
-----------
    trunk/dports/sysutils/rpm/files/patch-Makefile.in

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2014-01-08 22:38:52 UTC (rev 115686)
+++ trunk/dports/sysutils/rpm/Portfile	2014-01-08 22:45:42 UTC (rev 115687)
@@ -4,7 +4,7 @@
 
 name			rpm
 version			4.4.9
-revision		15
+revision		16
 platforms		darwin freebsd linux
 license			GPL-2 LGPL-2
 categories		sysutils archivers
@@ -55,6 +55,7 @@
 			patch-configure \
 			patch-db3-configure \
 			patch-zlib-configure \
+			patch-Makefile.in \
 			patch-Makefile.PL \
 			patch-darwin.prov \
 			patch-fts.c \

Added: trunk/dports/sysutils/rpm/files/patch-Makefile.in
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-Makefile.in	                        (rev 0)
+++ trunk/dports/sysutils/rpm/files/patch-Makefile.in	2014-01-08 22:45:42 UTC (rev 115687)
@@ -0,0 +1,29 @@
+--- Makefile.in.orig	2007-05-19 21:32:14.000000000 +0200
++++ Makefile.in	2014-01-08 23:22:47.000000000 +0100
+@@ -458,13 +458,15 @@
+ 
+ staticLDFLAGS = # @LDFLAGS_STATIC@ # @LDFLAGS_NPTL@
+ myLDFLAGS = @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
+-myLDADD = \
++myLDADD_la = \
+ 	$(top_builddir)/lib/librpm.la \
+ 	$(top_builddir)/rpmdb/librpmdb.la \
+ 	$(top_builddir)/rpmio/librpmio.la \
+-	@WITH_POPT_LIB@ \
+ 	@WITH_ZLIB_LIB@ \
++	
++myLDADD = $(myLDADD_la) \
++	@WITH_POPT_LIB@ \
+ 	@LIBMISC@
+ 
+ rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
+ bin_SCRIPTS = gendiff
+@@ -1160,7 +1161,7 @@
+ rpmq.o:	$(top_srcdir)/rpmqv.c
+ 	$(COMPILE) -fpie -DIAM_RPMQV -o $@ -c $<
+ 
+-$(PROGRAMS): 		$(myLDADD) @WITH_APIDOCS_TARGET@
++$(PROGRAMS): 		$(myLDADD_la) @WITH_APIDOCS_TARGET@
+ 
+ .PHONY:	splint
+ splint:

Modified: trunk/dports/sysutils/rpm/files/patch-configure
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-configure	2014-01-08 22:38:52 UTC (rev 115686)
+++ trunk/dports/sysutils/rpm/files/patch-configure	2014-01-08 22:45:42 UTC (rev 115687)
@@ -9,25 +9,12 @@
  fi
  export CFLAGS LDFLAGS
  
-@@ -27309,8 +27309,8 @@
- if test $ac_cv_lib_popt_poptGetContext = yes; then
+@@ -27546,7 +27546,7 @@
  
-       WITH_POPT_SUBDIR=
--      WITH_POPT_INCLUDE=
--      WITH_POPT_LIB="-lpopt"
-+      WITH_POPT_INCLUDE='-I${prefix}/include'
-+      WITH_POPT_LIB='${prefix}/lib/libpopt.la'
- 
- fi
- 
-@@ -27545,8 +27545,8 @@
- _ACEOF
- 
      WITH_SQLITE3_SUBDIR=
--    WITH_SQLITE3_INCLUDE=
+     WITH_SQLITE3_INCLUDE=
 -    WITH_SQLITE3_LIB="-lsqlite"
-+    WITH_SQLITE3_INCLUDE='-I${prefix}/include'
-+    WITH_SQLITE3_LIB='${prefix}/lib/libsqlite3.la'
++    WITH_SQLITE3_LIB="-lsqlite3"
      DBLIBSRCS="$DBLIBSRCS sqlite.c"
  
  fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140108/83f4fb38/attachment.html>