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: 19-Apr-2015 20:44:53
Branch: rpm-5_4 Handle: 2015041918445300
Modified files: (Branch: rpm-5_4)
rpm Makefile.am configure.ac
Log:
- distcheck: hack out lua/tests/{,libs/}Makefile
Summary:
Revision Changes Path
2.263.2.34 +3 -2 rpm/Makefile.am
2.472.2.129 +8 -0 rpm/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.263.2.33 -r2.263.2.34 Makefile.am
--- rpm/Makefile.am 23 Feb 2015 15:23:35 -0000 2.263.2.33
+++ rpm/Makefile.am 19 Apr 2015 18:44:53 -0000 2.263.2.34
@@ -304,11 +304,12 @@
check-local:
-# XXX W2DO: refactor to {js,ruby,python}/Makefile.am
+# XXX W2DO: refactor to {js,lua,python,ruby}/Makefile.am
distclean-local:
[ -d js ] && rm -rf js/Makefile js/.deps
- [ -d ruby ] && rm -rf ruby/Makefile ruby/.deps
+ [ -d lua ] && rm -f lua/tests/Makefile lua/tests/libs/Makefile
[ -d python ] && rm -rf python/Makefile python/.deps
+ [ -d ruby ] && rm -rf ruby/Makefile ruby/.deps
# XXX MacOSX: -I$(distdir)/_inst/include/db60 in flags w "make distcheck"
distcheck-hook:
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.128 -r2.472.2.129 configure.ac
--- rpm/configure.ac 3 Mar 2015 20:50:38 -0000 2.472.2.128
+++ rpm/configure.ac 19 Apr 2015 18:44:53 -0000 2.472.2.129
@@ -1148,6 +1148,13 @@
])
fi
+dnl # <cpuid.h> API
+AC_CHECK_HEADERS(cpuid.h)
+
+dnl # <sys/getauxv.h> API
+AC_CHECK_HEADERS(sys/getauxv.h)
+AC_CHECK_FUNC(getauxv)
+
dnl # <beecrypt/api.h> tries to retrofit an assert(x) macro
AC_CHECK_HEADERS(assert.h)
@@ -3105,6 +3112,7 @@
macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool
macros/mandriva macros/suse macros/fedora macros/mono macros/perl
macros/pkgconfig macros/php
macros/python macros/ruby macros/selinux macros/tcl
+ lua/tests/Makefile lua/tests/libs/Makefile
doc/Makefile
doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
