summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-05-25 17:15:20 +0000
committerjbj <devnull@localhost>2002-05-25 17:15:20 +0000
commit3067a2c91dc0e85acab883e3fccc5caf15247d89 (patch)
tree0590d6d86449d198109fda8de63f8a1349d385a6
parent4f1bba10aa4a9463b068aff002e7c8ffd36f21c1 (diff)
downloadrpm-3067a2c91dc0e85acab883e3fccc5caf15247d89.tar.gz
rpm-3067a2c91dc0e85acab883e3fccc5caf15247d89.tar.bz2
rpm-3067a2c91dc0e85acab883e3fccc5caf15247d89.zip
- re-enable rpm-python sub-package.
- fix: resurrect "()(64bit)" markings using objdump. CVS patchset: 5448 CVS date: 2002/05/25 17:15:20
-rw-r--r--CHANGES2
-rw-r--r--autodeps/linux.req6
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.in4
-rw-r--r--python/Makefile.am15
-rw-r--r--python/Makefile.in22
-rw-r--r--rpm.spec.in4
7 files changed, 34 insertions, 21 deletions
diff --git a/CHANGES b/CHANGES
index b4c5592cf..46cde1456 100644
--- a/CHANGES
+++ b/CHANGES
@@ -116,6 +116,8 @@
- Grand Renaming of rpm data types.
- fix: synthesize unpacking progress callbacks for packages w/o files.
- add rpmds/rpmfi/rpmts methods to bindings.
+ - re-enable rpm-python sub-package.
+ - fix: resurrect "()(64bit)" markings using objdump.
4.0.3 -> 4.0.4:
- solaris: translate i86pc to i386 (#57182).
diff --git a/autodeps/linux.req b/autodeps/linux.req
index 87a4bfba5..23bc50752 100644
--- a/autodeps/linux.req
+++ b/autodeps/linux.req
@@ -97,7 +97,11 @@ for f in $liblist $exelist ; do
/^$/ { START=0; }
/^Dynamic Section:$/ { START=1; }
(START==1) && /NEEDED/ {
- if (needed) { print $2 ; }
+ if (needed) {
+ sub(/$/, "()'$mark64'", $2) ;
+ sub(/()$/, "", $2) ;
+ print $2 ;
+ }
}
/^Version References:$/ { START=2; }
(START==2) && /required from/ {
diff --git a/autogen.sh b/autogen.sh
index 7dbbaa517..6749736eb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -42,7 +42,7 @@ if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then
mandir=/usr/man
infodir=/usr/info
fi
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} "$@"
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} --without-javaglue "$@"
else
./configure "$@"
fi
diff --git a/configure.in b/configure.in
index f338dec9a..bfc9b660c 100644
--- a/configure.in
+++ b/configure.in
@@ -807,7 +807,7 @@ dnl
withval=auto
AC_ARG_WITH(python, [ --with-python build rpm python bindings ])
-WITH_PYTHON_VERSION=
+WITH_PYTHON_VERSION=$withval
if test $withval = auto ; then
AC_MSG_CHECKING(for python 2.2)
@@ -837,7 +837,7 @@ main() {
fi
-if test -n "$WITH_PYTHON_VERSION" ; then
+if test "$WITH_PYTHON_VERSION" != no ; then
WITH_PYTHON_SUBDIR=python
WITH_PYTHON_SUBPACKAGE=1
else
diff --git a/python/Makefile.am b/python/Makefile.am
index ae52c4e58..0f00575e3 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -13,13 +13,14 @@ INCLUDES = -I. \
-I/usr/include/python${PYVER} \
@INCPATH@
-EXTRA_DIST = db-py.h hash.h header-py.h upgrade.h
+noinst_HEADERS = \
+ db-py.h hash.h header-py.h rpmds-py.h rpmfi-py.h rpmts-py.h upgrade.h
mylibs= \
- $(top_builddir)/lib/librpm.la \
- $(top_builddir)/rpmdb/librpmdb.la \
- $(top_builddir)/rpmio/librpmio.la \
- $(top_builddir)/popt/libpopt.la
+ $(top_builddir)/lib/.libs/librpm.so \
+ $(top_builddir)/rpmdb/.libs/librpmdb.so \
+ $(top_builddir)/rpmio/.libs/librpmio.so \
+ $(top_builddir)/popt/.libs/libpopt.so
LDADD =
@@ -37,10 +38,10 @@ librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c \
db-py.c header-py.c rpmds-py.c rpmfi-py.c rpmts-py.c
rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
- $(LINK) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
+ $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
poptmodule.so$(EXEEXT): $(poptmodule_so_OBJECTS)
- $(LINK) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS)
+ $(CC) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS)
.PHONY: lclint
lclint:
diff --git a/python/Makefile.in b/python/Makefile.in
index 446fb3cd9..5d724d5ac 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -208,13 +208,15 @@ INCLUDES = -I. \
@INCPATH@
-EXTRA_DIST = db-py.h hash.h header-py.h upgrade.h
+noinst_HEADERS = \
+ db-py.h hash.h header-py.h rpmds-py.h rpmfi-py.h rpmts-py.h upgrade.h
+
mylibs = \
- $(top_builddir)/lib/librpm.la \
- $(top_builddir)/rpmdb/librpmdb.la \
- $(top_builddir)/rpmio/librpmio.la \
- $(top_builddir)/popt/libpopt.la
+ $(top_builddir)/lib/.libs/librpm.so \
+ $(top_builddir)/rpmdb/.libs/librpmdb.so \
+ $(top_builddir)/rpmio/.libs/librpmio.so \
+ $(top_builddir)/popt/.libs/libpopt.so
LDADD =
@@ -277,7 +279,9 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
CFLAGS = @CFLAGS@
DIST_SOURCES = $(librpmmodule_la_SOURCES) $(poptmodule_so_SOURCES) \
$(rpmmodule_so_SOURCES)
-DIST_COMMON = ChangeLog Makefile.am Makefile.in
+HEADERS = $(noinst_HEADERS)
+
+DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in
SOURCES = $(librpmmodule_la_SOURCES) $(poptmodule_so_SOURCES) $(rpmmodule_so_SOURCES)
all: all-am
@@ -433,7 +437,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(pythondir)
@@ -515,10 +519,10 @@ uninstall-am: uninstall-info-am uninstall-pythonPROGRAMS
rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
- $(LINK) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
+ $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
poptmodule.so$(EXEEXT): $(poptmodule_so_OBJECTS)
- $(LINK) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS)
+ $(CC) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS)
.PHONY: lclint
lclint:
diff --git a/rpm.spec.in b/rpm.spec.in
index bd8ad31e5..61c174293 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -515,8 +515,10 @@ fi
%{__prefix}/include/popt.h
%changelog
-* Thu May 23 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.16
+* Fri May 24 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.16
- add rpmds/rpmfi/rpmts methods to bindings.
+- re-enable rpm-python sub-package.
+- fix: resurrect "()(64bit)" markings using objdump.
* Sun May 19 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.15
- Grand Renaming of rpm data types.