RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 08-May-2011 01:29:13
Branch: rpm-5_4 Handle: 2011050723291102
Modified files: (Branch: rpm-5_4)
rpm CHANGES Makefile.am configure.ac devtool.conf
rpm/rpmconstant Makefile.am
rpm/tests Makefile.am
rpm/tests/mongo Makefile.am
rpm/tools Makefile.am
Log:
- openmamba: --with-neon=internal needs libs to be added explicitly to
linkage.
- applied vendor Openmamba patches
Summary:
Revision Changes Path
1.3501.2.120+4 -1 rpm/CHANGES
2.263.2.4 +1 -0 rpm/Makefile.am
2.472.2.16 +8 -2 rpm/configure.ac
2.365.2.8 +71 -0 rpm/devtool.conf
1.13.2.1 +3 -2 rpm/rpmconstant/Makefile.am
1.95.2.20 +1 -0 rpm/tests/Makefile.am
1.5.2.2 +1 -0 rpm/tests/mongo/Makefile.am
2.170.2.2 +1 -0 rpm/tools/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.119 -r1.3501.2.120 CHANGES
--- rpm/CHANGES 2 May 2011 14:11:36 -0000 1.3501.2.119
+++ rpm/CHANGES 7 May 2011 23:29:11 -0000 1.3501.2.120
@@ -1,5 +1,8 @@
5.4.0 -> 5.4.1:
- - mdawkins: i18n update cs.po da.po de.po es.po fi.po fr.po id.po is.po
it.po ja.po
+ - jbj: openmamba: --with-neon=internal needs libs to be added explicitly
+ to linkage.
+ - mdawkins: applied vendor Openmamba patches
+ - mdawkins: i18n update cs.po da.po de.po es.po fi.po fr.po id.po is.po
it.po ja.po
ko.po nb.po nl.po pa.po pl.po pt.po pt_BR.po ru.po sk.po sl.po
sr.po sv.po tr.po
uk.po vi.po zh_TW.po
- devzero2000: permit in configure phase to
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.263.2.3 -r2.263.2.4 Makefile.am
--- rpm/Makefile.am 10 Apr 2011 10:54:19 -0000 2.263.2.3
+++ rpm/Makefile.am 7 May 2011 23:29:11 -0000 2.263.2.4
@@ -92,6 +92,7 @@
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
$(top_builddir)/misc/librpmmisc.la \
+ @WITH_NEON_LIBS@ \
@LTLIBINTL@
bin_PROGRAMS = rpm rpmbuild
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.15 -r2.472.2.16 configure.ac
--- rpm/configure.ac 20 Apr 2011 15:56:59 -0000 2.472.2.15
+++ rpm/configure.ac 7 May 2011 23:29:11 -0000 2.472.2.16
@@ -1977,7 +1977,9 @@
esac
RPMCANONVENDOR="$target_vendor"
case "${target_vendor}" in
-unknown|pc|ibm|redhat|pld|mandriva|conectiva|lvr|yellowdog|caos|crux|ark)
+unknown|pc|ibm|redhat|pld|mandriva|conectiva|lvr|yellowdog|caos|crux|ark|momonga|openmamba)
+ test -f /etc/momonga-release && RPMCANONVENDOR=momonga
+ test -f /etc/fedora-release && RPMCANONVENDOR=fedora
test -f /etc/redhat-release && RPMCANONVENDOR=redhat
test -f /etc/pld-release && RPMCANONVENDOR=pld
test -f /etc/mandriva-release && RPMCANONVENDOR=mandriva
@@ -1987,6 +1989,7 @@
test -f /etc/caos-release && RPMCANONVENDOR=caos
test -f /usr/bin/crux && RPMCANONVENDOR=crux
test -f /etc/ark-release && RPMCANONVENDOR=ark
+ test -f /etc/openmamba-release && RPMCANONVENDOR=openmamba
;;
esac
RPMCANONOS="$target_os_noversion"
@@ -2285,7 +2288,7 @@
AC_MSG_CHECKING([if building for a specfic vendor])
AC_ARG_WITH(
[vendor],
- AS_HELP_STRING([--with-vendor=VENDOR], [build with a supported vendor's
specific set of changes: mandriva, ark, fedora]),
+ AS_HELP_STRING([--with-vendor=VENDOR], [build with a supported vendor's
specific set of changes: mandriva, ark, fedora, openmamba]),
[if test ".$withval" != .no; then
case "$withval" in
"mandriva")
@@ -2298,6 +2301,9 @@
"fedora")
AC_DEFINE([RPM_VENDOR_FEDORA], 1, Vendor is Fedora)
;;
+ "openmamba")
+ AC_DEFINE([RPM_VENDOR_OPENMAMBA], 1, Vendor is openmamba)
+ ;;
esac
AC_MSG_RESULT([$withval])
else
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.365.2.7 -r2.365.2.8 devtool.conf
--- rpm/devtool.conf 31 Mar 2011 22:56:20 -0000 2.365.2.7
+++ rpm/devtool.conf 7 May 2011 23:29:11 -0000 2.365.2.8
@@ -535,6 +535,77 @@
--enable-build-debug \
--enable-maintainer-mode
+# OpenMAMBA
+# --with-ruby=/usr/lib:/usr/lib/ruby/1.8/i586-linux/ \
+%openmamba
+ %autogen
+ %configure \
+ --verbose \
+ --prefix=/usr \
+ --with-db \
+ --with-dbsql \
+ --without-db-tools-integrated \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-file \
+ --with-path-magic=/usr/share/misc/magic \
+ --with-lua=internal \
+ --with-tcl \
+ --without-sqlite \
+ --with-syck=internal \
+ --with-readline \
+ --with-augeas \
+ --with-beecrypt=internal \
+ --with-openssl \
+ --with-nss \
+ --with-gcrypt \
+ --without-tomcrypt \
+ --without-tpm \
+ --with-libtasn1 \
+ --with-pakchois \
+ --with-gnutls \
+ --with-neon=internal \
+ --without-libroxy \
+ --with-expat \
+ --without-libxml2 \
+ --with-pcre \
+ --enable-utf8 \
+ --with-uuid \
+ --with-attr \
+ --with-acl \
+ --without-xar \
+ --with-popt=internal \
+ --with-keyutils \
+ --with-pthreads \
+ --with-libelf \
+ --without-cudf \
+ --without-ficl \
+ --without-aterm \
+ --without-nix \
+ --without-bash \
+ --without-rc \
+ --without-js \
+ --without-gpsee \
+ --with-python \
+ --with-pythonembed=/usr/lib:/usr/include/python2.6 \
+ --with-perl \
+ --without-perlembed \
+
--with-perlembed=/usr/lib:/usr/lib/perl5/5.10.1/i386-linux-thread-multi/CORE/ \
+ --without-ruby \
+ --without-selinux \
+ --without-sepol \
+ --without-semanage \
+ --without-squirrel \
+ --with-build-extlibdep \
+ --with-build-maxextlibdep \
+ --with-valgrind \
+ --enable-build-pic \
+ --enable-build-versionscript \
+ --enable-build-warnings \
+ --enable-build-debug \
+ --enable-maintainer-mode
+
# Caixa Magica 14
%cm14
%autogen
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/Makefile.am
============================================================================
$ cvs diff -u -r1.13 -r1.13.2.1 Makefile.am
--- rpm/rpmconstant/Makefile.am 2 Nov 2010 15:19:23 -0000 1.13
+++ rpm/rpmconstant/Makefile.am 7 May 2011 23:29:12 -0000 1.13.2.1
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.13 2010/11/02 15:19:23 jbj Exp $
+# $Id: Makefile.am,v 1.13.2.1 2011/05/07 23:29:12 jbj Exp $
AUTOMAKE_OPTIONS = 1.4 foreign
@@ -37,7 +37,8 @@
endif
librpmconstant_la_LIBADD = \
$(top_builddir)/rpmio/librpmio.la \
- $(top_builddir)/misc/librpmmisc.la
+ $(top_builddir)/misc/librpmmisc.la \
+ @WITH_NEON_LIBS@
librpmconstant.la: $(librpmconstant_la_OBJECTS)
$(librpmconstant_la_DEPENDENCIES)
$(librpmconstant_la_LINK) -rpath $(usrlibdir)
$(librpmconstant_la_OBJECTS) $(librpmconstant_la_LIBADD)
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.95.2.19 -r1.95.2.20 Makefile.am
--- rpm/tests/Makefile.am 24 Mar 2011 22:29:44 -0000 1.95.2.19
+++ rpm/tests/Makefile.am 7 May 2011 23:29:12 -0000 1.95.2.20
@@ -58,6 +58,7 @@
RPMIO_LDADD = \
$(top_builddir)/rpmio/librpmio.la \
$(top_builddir)/misc/librpmmisc.la \
+ @WITH_NEON_LIBS@ \
@LTLIBINTL@
RPMDB_LDADD = \
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/Makefile.am
============================================================================
$ cvs diff -u -r1.5.2.1 -r1.5.2.2 Makefile.am
--- rpm/tests/mongo/Makefile.am 3 Apr 2011 22:58:47 -0000 1.5.2.1
+++ rpm/tests/mongo/Makefile.am 7 May 2011 23:29:12 -0000 1.5.2.2
@@ -29,6 +29,7 @@
RPMIO_LDADD = \
$(top_builddir)/rpmio/librpmio.la \
$(top_builddir)/misc/librpmmisc.la \
+ @WITH_NEON_LIBS@ \
@LTLIBINTL@
#RPMDB_LDADD = \
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/Makefile.am
============================================================================
$ cvs diff -u -r2.170.2.1 -r2.170.2.2 Makefile.am
--- rpm/tools/Makefile.am 27 Jan 2011 01:10:02 -0000 2.170.2.1
+++ rpm/tools/Makefile.am 7 May 2011 23:29:13 -0000 2.170.2.2
@@ -33,6 +33,7 @@
RPMMISC_LDADD_COMMON = \
$(top_builddir)/misc/librpmmisc.la \
+ @WITH_NEON_LIBS@ \
@LTLIBINTL@
RPMIO_LDADD_COMMON = \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
