Commits

Anders F. Björklund authored fab32335dc6
rpm: allow building with popt without la (https://trac.macports.org/ticket/41697)

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@115687 d073be05-634f-4543-b044-5fe20cf6d1d6
No tags

sysutils/rpm/files/patch-configure

Modified
1 1 --- configure.orig 2007-06-22 01:21:33.000000000 +0200
2 2 +++ configure 2007-06-22 01:23:43.000000000 +0200
3 3 @@ -5347,7 +5347,7 @@
4 4
5 5 if test "$ac_cv_c_compiler_gnu" = yes; then
6 6 CFLAGS="$CFLAGS -fPIC -DPIC -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
7 7 - LDFLAGS="-pie"
8 8 + LDFLAGS="$LDFLAGS -pie"
9 9 fi
10 10 export CFLAGS LDFLAGS
11 11
12 -@@ -27309,8 +27309,8 @@
13 - if test $ac_cv_lib_popt_poptGetContext = yes; then
14 -
15 - WITH_POPT_SUBDIR=
16 -- WITH_POPT_INCLUDE=
17 -- WITH_POPT_LIB="-lpopt"
18 -+ WITH_POPT_INCLUDE='-I${prefix}/include'
19 -+ WITH_POPT_LIB='${prefix}/lib/libpopt.la'
20 -
21 - fi
22 -
23 -@@ -27545,8 +27545,8 @@
24 - _ACEOF
12 +@@ -27546,7 +27546,7 @@
25 13
26 14 WITH_SQLITE3_SUBDIR=
27 -- WITH_SQLITE3_INCLUDE=
15 + WITH_SQLITE3_INCLUDE=
28 16 - WITH_SQLITE3_LIB="-lsqlite"
29 -+ WITH_SQLITE3_INCLUDE='-I${prefix}/include'
30 -+ WITH_SQLITE3_LIB='${prefix}/lib/libsqlite3.la'
17 ++ WITH_SQLITE3_LIB="-lsqlite3"
31 18 DBLIBSRCS="$DBLIBSRCS sqlite.c"
32 19
33 20 fi
34 21 @@ -36560,7 +36560,7 @@
35 22
36 23
37 24
38 25 -SYSCONFIGDIR="`echo /etc/rpm`"
39 26 +SYSCONFIGDIR="`echo $sysconfdir/rpm`"
40 27

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut