]> git.pld-linux.org Git - packages/rpm.git/blame_incremental - rpm-system_libs.patch
projects / packages / rpm.git / blame_incremental
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (non-incremental) | history | HEAD
- ugly gcc hack not needed.
[packages/rpm.git] / rpm-system_libs.patch
... / ...
CommitLineData
1diff -urN rpm.org/configure.ac rpm/configure.ac
2--- rpm.org/configure.ac 2004-06-14 11:46:10.220092656 +0200
3+++ rpm/configure.ac 2004-06-14 11:47:13.499472728 +0200
4@@ -428,6 +428,18 @@
5 AC_SUBST(WITH_BEECRYPT_INCLUDE)
6 AC_SUBST(WITH_BEECRYPT_LIB)
7
8+WITH_POPT_SUBDIR=
9+WITH_POPT_LIB=
10+AC_CHECK_HEADERS([popt.h])
11+AC_CHECK_LIB(popt, poptGetContext, [
12+ AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.])
13+ WITH_POPT_LIB="-lpopt"
14+ ],[WITH_POPT_SUBDIR="popt"
15+ WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"])
16+
17+AC_SUBST(WITH_POPT_SUBDIR)
18+AC_SUBST(WITH_POPT_LIB)
19+
20 AC_CHECK_FUNC(setreuid, [], [
21 AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
22 ])
23@@ -1203,7 +1215,7 @@
24 dnl # XXX Propagate -lucb to popt ...
25 dnl export LIBS INCPATH CONFIG_SITE
26
27-AC_CONFIG_SUBDIRS(popt zlib file sqlite db3)
28+AC_CONFIG_SUBDIRS(file)
29
30 AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
31 scripts/perl.req scripts/perl.prov
32@@ -1227,7 +1239,7 @@
33 python/rpmdb/test/Makefile
34 lua/Makefile
35 ])
36-AC_CONFIG_COMMANDS([default],[[ echo timestamp > popt/stamp-h.in
37+AC_CONFIG_COMMANDS([default],[[
38 echo timestamp > stamp-h.in
39
40 ]],[[]])
41diff -urN rpm.org/lib/Makefile.am rpm/lib/Makefile.am
42--- rpm.org/lib/Makefile.am 2004-06-14 11:46:08.925289496 +0200
43+++ rpm/lib/Makefile.am 2004-06-14 11:47:13.502472272 +0200
44@@ -40,7 +40,7 @@
45 librpm_la_LDFLAGS = -release 4.4 $(LDFLAGS) \
46 $(top_builddir)/rpmdb/librpmdb.la \
47 $(top_builddir)/rpmio/librpmio.la \
48- $(top_builddir)/popt/libpopt.la \
49+ -lpopt \
50 @WITH_SELINUX_LIB@ \
51 @INTLLIBS@
52
53diff -urN rpm.org/Makefile.am rpm/Makefile.am
54--- rpm.org/Makefile.am 2004-06-14 11:46:04.409975928 +0200
55+++ rpm/Makefile.am 2004-06-14 11:48:04.236759488 +0200
56@@ -14,7 +14,7 @@
57 po/*.in po/*.po po/rpm.pot \
58 rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
59
60-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
61+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
62
63 INCLUDES = \
64 -I$(top_srcdir)/build \
65@@ -22,7 +22,6 @@
66 -I$(top_srcdir)/rpmdb \
67 -I$(top_srcdir)/rpmio \
68 @WITH_BEECRYPT_INCLUDE@ \
69- -I$(top_srcdir)/popt \
70 -I$(top_srcdir)/misc \
71 @WITH_LIBELF_INCLUDE@ \
72 @INCPATH@
73@@ -34,7 +33,7 @@
74 $(top_builddir)/lib/librpm.la \
75 $(top_builddir)/rpmdb/librpmdb.la \
76 $(top_builddir)/rpmio/librpmio.la \
77- $(top_builddir)/popt/libpopt.la \
78+ -lpopt \
79 @WITH_ZLIB_LIB@ \
80 @INTLLIBS@ \
81 @LIBMISC@
82@@ -107,7 +106,6 @@
83 -load lib/rpmlib.lcd \
84 -load rpmdb/rpmdb.lcd \
85 -load rpmio/rpmio.lcd \
86- -load popt/popt.lcd \
87 $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
88
89 .PHONY: lint
90@@ -117,9 +115,7 @@
91 `make -s sources -C lib` \
92 `make -s sources -C rpmdb` \
93 `make -s sources -C rpmio` \
94- `make -s sources -C beecrypt` \
95- `make -s sources -C file/src` \
96- `make -s sources -C popt`
97+ `make -s sources -C file/src`
98
99 CVSTAG = r$(subst .,-,$(VERSION))
100
101diff -urN rpm.org/rpmdb/Makefile.am rpm/rpmdb/Makefile.am
102--- rpm.org/rpmdb/Makefile.am 2004-06-14 11:46:09.726167744 +0200
103+++ rpm/rpmdb/Makefile.am 2004-06-14 11:47:13.524468928 +0200
104@@ -9,7 +9,6 @@
105 -I$(top_srcdir)/lib \
106 -I$(top_srcdir)/rpmio \
107 @WITH_BEECRYPT_INCLUDE@ \
108- -I$(top_srcdir)/popt \
109 -I$(top_srcdir)/misc \
110 @WITH_LIBELF_INCLUDE@ \
111 @INCPATH@
112@@ -51,7 +50,7 @@
113 tagname.c tagtbl.c
114 librpmdb_la_LDFLAGS = -release 4.4 \
115 $(top_builddir)/rpmio/librpmio.la \
116- $(top_builddir)/popt/libpopt.la \
117+ @WITH_POPT_LIB@ \
118 @WITH_SQLITE3_LIB@ \
119 @WITH_LIBELF_LIB@
120 librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la)
121--- rpm.org/rpmio/Makefile.am.org 2004-11-18 17:42:53.756263795 +0100
122+++ rpm.org/rpmio/Makefile.am 2004-11-18 17:43:09.526885309 +0100
123@@ -12,7 +12,6 @@
124 -I$(top_srcdir) \
125 @WITH_BEECRYPT_INCLUDE@ \
126 @WITH_LUA_INCLUDE@ \
127- -I$(top_srcdir)/popt \
128 -I$(top_srcdir)/misc \
129 @INCPATH@
130
131@@ -71,47 +71,47 @@
132 tax_LDADD = librpmio.la
133
134 tdigest_SOURCES = tdigest.c
135-tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt
136+tdigest_LDADD = librpmio.la -lpopt -lgcrypt
137
138 tdir_SOURCES = tdir.c
139 tdir_LDFLAGS = @LDFLAGS_STATIC@
140-tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
141+tdir_LDADD = librpmio.la -lpopt
142
143 tfts_SOURCES = tfts.c
144 tfts_LDFLAGS = @LDFLAGS_STATIC@
145-tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
146+tfts_LDADD = librpmio.la -lpopt
147
148 tget_SOURCES = tget.c
149 tget_LDFLAGS = @LDFLAGS_STATIC@
150-tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
151+tget_LDADD = librpmio.la -lpopt
152
153 thkp_SOURCES = thkp.c
154 thkp_LDFLAGS = @LDFLAGS_STATIC@
155-thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
156+thkp_LDADD = librpmio.la -lpopt
157
158 tput_SOURCES = tput.c
159 tput_LDFLAGS = @LDFLAGS_STATIC@
160-tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
161+tput_LDADD = librpmio.la -lpopt
162
163
164 tglob_SOURCES = tglob.c
165 tglob_LDFLAGS = @LDFLAGS_STATIC@
166-tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
167+tglob_LDADD = librpmio.la -lpopt
168
169 tinv_SOURCES = tinv.c
170 tinv_LDFLAGS = @LDFLAGS_STATIC@
171-tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
172+tinv_LDADD = librpmio.la -lpopt
173
174 tkey_SOURCES = tkey.c
175 tkey_LDFLAGS = @LDFLAGS_STATIC@
176-tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
177+tkey_LDADD = librpmio.la -lpopt
178
179 tring_SOURCES = tring.c
180 tring_LDFLAGS = @LDFLAGS_STATIC@
181-tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
182+tring_LDADD = librpmio.la -lpopt
183
184 trpmio_SOURCES = trpmio.c
185-trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
186+trpmio_LDADD = librpmio.la -lpopt
187
188 tsw_SOURCES = tsw.c
189 tsw_LDFLAGS = librpmio.la
190diff -urN rpm.org/tools/Makefile.am rpm/tools/Makefile.am
191--- rpm.org/tools/Makefile.am 2004-06-14 11:46:09.906140384 +0200
192+++ rpm/tools/Makefile.am 2004-06-14 11:47:13.532467712 +0200
193@@ -9,7 +9,6 @@
194 -I$(top_srcdir)/rpmdb \
195 -I$(top_srcdir)/rpmio \
196 @WITH_BEECRYPT_INCLUDE@ \
197- -I$(top_srcdir)/popt \
198 @WITH_LIBELF_INCLUDE@ \
199 @WITH_LIBDWARF_INCLUDE@ \
200 -I$(top_srcdir)/file/src \
201@@ -37,7 +36,7 @@
202
203 debugedit_SOURCES = debugedit.c hashtab.c
204 debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
205- $(top_builddir)/popt/libpopt.la
206+ -lpopt
207
208 javadeps_SOURCES = javadeps.c
209
210--- rpm/python/Makefile.am.org 2004-11-18 20:01:55.658219108 +0100
211+++ rpm/python/Makefile.am 2004-11-18 20:02:10.571929388 +0100
212@@ -16,7 +16,6 @@
213 -I$(top_srcdir)/rpmdb \
214 -I$(top_srcdir)/rpmio \
215 @WITH_BEECRYPT_INCLUDE@ \
216- -I$(top_srcdir)/popt \
217 -I$(top_srcdir)/misc \
218 -I$(pyincdir) \
219 @WITH_LIBELF_INCLUDE@ \
220@@ -31,7 +30,7 @@
221 $(top_builddir)/lib/librpm.la \
222 $(top_builddir)/rpmdb/librpmdb.la \
223 $(top_builddir)/rpmio/librpmio.la \
224- $(top_builddir)/popt/libpopt.la \
225+ -lpopt \
226 $(top_builddir)/build/librpmbuild.la \
227 @WITH_LIBELF_LIB@
228
RPM Package Manager
This page took 0.030451 seconds and 4 git commands to generate.