[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 16-Jul-2017 21:07:02 Branch: rpm-5_4 Handle: 2017071619070200 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: update timestamp. Summary: RevisionChanges Path 2.472.2.180 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.179 -r2.472.2.180 configure.ac --- rpm/configure.ac 16 Jul 2017 18:15:41 - 2.472.2.179 +++ rpm/configure.ac 16 Jul 2017 19:07:02 - 2.472.2.180 @@ -9,7 +9,7 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) AC_INIT([rpm],[5.4.18],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2016-05-12" dnl # [-MM[-DD[ HH[:MM +PACKAGE_TIMESTAMP="2017-07-16" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac rpm/js/ Makefile.am rpmjs45.cpp ...
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: 10-Jul-2017 22:11:23
Branch: rpm-5_4 Handle: 2017071020112201
Modified files: (Branch: rpm-5_4)
rpm configure.ac
rpm/js Makefile.am rpmjs45.cpp
rpm/js/src Makefile.am
rpm/rpmio Makefile.am rpmjss.cpp rpmjss.h
Log:
- rpmjss: permit --without-mozjs builds (default).
Summary:
RevisionChanges Path
2.472.2.177 +5 -1 rpm/configure.ac
1.44.2.18 +4 -20 rpm/js/Makefile.am
1.1.2.10+0 -1 rpm/js/rpmjs45.cpp
1.1.2.6 +8 -30 rpm/js/src/Makefile.am
1.293.2.106 +6 -20 rpm/rpmio/Makefile.am
1.1.2.4 +20 -11 rpm/rpmio/rpmjss.cpp
1.1.2.7 +1 -0 rpm/rpmio/rpmjss.h
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.176 -r2.472.2.177 configure.ac
--- rpm/configure.ac 10 Jul 2017 09:39:54 - 2.472.2.176
+++ rpm/configure.ac 10 Jul 2017 20:11:22 - 2.472.2.177
@@ -3981,19 +3981,23 @@
#AC_LANG_POP(C++)
WITH_SPIDERMONKEY_SUBDIR=""
+WITH_MOZJS_CXXFLAGS=""
AC_LANG_PUSH(C++)
RPM_CHECK_LIB(
[MozJS (mozjs)], [mozjs],
[mozjs], [_fini], [jsapi.h],
-[no,internal:none], [js:include:extract],
+[no,internal:none], [js:include:src],
[
if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
WITH_SPIDERMONKEY_SUBDIR="js/src"
AC_DEFINE(HAVE_JSAPI_H, 1, [Define to 1 if you have ])
AC_DEFINE(HAVE_LIBMOZJS, 1, [Define to 1 if you have the 'mozjs'
library (-lmozjs).])
+ WITH_MOZJS_CXXFLAGS="-DEXPORT_JS_API -DDLL_PREFIX='\"lib\"'
-DDLL_SUFFIX='\".so\"' -DMOZILLA_CLIENT -D'moz_xmalloc(_len)=malloc(_len)'
-include
\${top_srcdir}/\$(WITH_MOZJS_SUBDIR)/extract/js/src/js/src/js-confdefs.h
-I\${top_srcdir}/\$(WITH_MOZJS_SUBDIR)/extract/js/src
-I\${top_srcdir}/\$(WITH_MOZJS_SUBDIR)/extract/mfbt \$(WITH_MOZJS_CPPFLAGS)"
+
fi
], [])
AC_LANG_POP(C++)
+AC_SUBST(WITH_MOZJS_CXXFLAGS)
AC_SUBST(WITH_SPIDERMONKEY_SUBDIR)
dnl # Google V8
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/Makefile.am
$ cvs diff -u -r1.44.2.17 -r1.44.2.18 Makefile.am
--- rpm/js/Makefile.am10 Jul 2017 10:09:25 - 1.44.2.17
+++ rpm/js/Makefile.am10 Jul 2017 20:11:22 - 1.44.2.18
@@ -33,7 +33,7 @@
@WITH_FILE_CPPFLAGS@ \
@WITH_GPSEE_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
- @WITH_MOZJS185_CPPFLAGS@ \
+ @WITH_MOZJS_CPPFLAGS@ \
@WITH_NEON_CPPFLAGS@ \
@WITH_POPT_CPPFLAGS@ \
@WITH_SYCK_CPPFLAGS@ \
@@ -118,25 +118,9 @@
rpmjs45shim.cpp \
rpmjs45.cpp
#${moz_builddir}/shell/Unified_cpp_js_src_shell0.cpp
-rpmjs45_CPPFLAGS = \
- -DEXPORT_JS_API \
- -DDLL_PREFIX='"lib"' -DDLL_SUFFIX='".so"' \
- -DMOZILLA_CLIENT \
- -D'moz_xmalloc(_len)=malloc(_len)' \
- -I${moz_srcdir}/mfbt \
- -I${moz_srcdir}/js/src \
- -I${srcdir}/include \
- -I../rpmio \
- -include ${moz_srcdir}/js/src/js/src/js-confdefs.h \
- -pthread \
- -fPIC \
- -O3
-#rpmjs_CXXFLAGS = \
-#-std=gnu++0x \
-#-fno-rtti
-rpmjs45_LDADD = \
- ${builddir}/src/libmozjs.la \
- $(RPMIO_LDADD_COMMON)
+rpmjs45_CXXFLAGS = $(WITH_MOZJS_CXXFLAGS) -I../rpmio -fPIC -O3
+rpmjs45_LDADD = $(WITH_MOZJS_LIBS)
+rpmjs45_LDFLAGS = $(WITH_MOZJS_LDFLAGS)
foo: rpmjs45
./rpmjs45 -f rpmjss.inp
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmjs45.cpp
$ cvs diff -u -r1.1.2.9 -r1.1.2.10 rpmjs45.cpp
--- rpm/js/rpmjs45.cpp10 Jul 2017 10:09:25 - 1.1.2.9
+++ rpm/js/rpmjs45.cpp10 Jul 2017 20:11:22 - 1.1.2.10
@@ -543,7 +543,6 @@
#include
/*==*/
-#define N_(_str)(_str)
struct poptOption rpmjssIPoptTable[] = {
{ "allow", '\0', POPT_BIT_SET,
&_jss.flags, RPMJSS_FLAGS_ALLOW,
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Makefile.am
$ cvs diff -u -r1.1.2.5 -r1.1.2.6 Makefile.am
--- rpm/js/src/Makefile.am8 Jul 2017 20:32:11 - 1.1.2.5
+++ rpm/js/src/Makefile.am10 Jul 2017 20:11:23 -
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 10-Jul-2017 11:39:54 Branch: rpm-5_4 Handle: 2017071009395400 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - rpmjs: AutoFU for mozjs. Summary: RevisionChanges Path 2.472.2.176 +97 -30 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.175 -r2.472.2.176 configure.ac --- rpm/configure.ac 13 Jun 2017 22:25:22 - 2.472.2.175 +++ rpm/configure.ac 10 Jul 2017 09:39:54 - 2.472.2.176 @@ -332,7 +332,7 @@ rpm_CFLAGS_ADD([-Wsuggest-attribute=pure],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-unused-but-set-variable], [RPM_CFLAGS]) dnl # -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/ - rpm_CFLAGS_ADD([-fno-delete-null-pointer-checks], [RPM_CFLAGS]) + rpm_CPPFLAGS_ADD([-fno-delete-null-pointer-checks], [RPM_CPPFLAGS]) rpm_CFLAGS_ADD([-Wbool-compare],[RPM_CFLAGS]) fi dnl # rpm_CFLAGS_ADD([-Wdouble-promotion],[RPM_CFLAGS]) @@ -449,6 +449,18 @@ dnl # rpm_CFLAGS_ADD([-fno-protect-parens],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-fstack-arrays],[RPM_CFLAGS]) +dnl # build RPM with Mozilla C++ flags (GCC only) + rpm_CXXFLAGS_ADD([-std=gnu++0x], [RPM_CXXFLAGS]) + rpm_CXXFLAGS_ADD([-fno-rtti], [RPM_CXXFLAGS]) + rpm_CXXFLAGS_ADD([-fno-tree-vrp], [RPM_CXXFLAGS]) + rpm_CXXFLAGS_ADD([-fno-strict-aliasing], [RPM_CXXFLAGS]) + rpm_CXXFLAGS_ADD([-ffunction-sections], [RPM_CXXFLAGS]) + rpm_CXXFLAGS_ADD([-fdata-sections], [RPM_CXXFLAGS]) + rpm_CXXFLAGS_ADD([-fno-exceptions], [RPM_CXXFLAGS]) + rpm_CXXFLAGS_ADD([-fno-math-errno], [RPM_CXXFLAGS]) + rpm_CXXFLAGS_ADD([-freorder-blocks], [RPM_CXXFLAGS]) + rpm_CXXFLAGS_ADD([-fomit-frame-pointer], [RPM_CXXFLAGS]) + dnl # build RPM instrumented for extra optimization/security (GCC only) dnl # --- other optimizations rpm_CFLAGS_ADD([-fexceptions], [RPM_CFLAGS]) @@ -3894,51 +3906,106 @@ ], []) AC_LANG_POP(C++) -dnl # JavaScript -WITH_JS_SUBDIR="" +dnl # Libicu18n/Libicuuc/Libicudata (for mozjs-45) +dnl # XXX FIXME: all the functions are versioned: _init will suffice. +RPM_CHECK_LIB( +[Libicu], [libicu], +[icui18n], [_init], [unicode/utypes.h], +[no,external:none], [], +[ +LIBS="$LIBS -licuuc -licudata" +], []) -WITH_SPIDERMONKEY_SUBDIR="" +dnl # Libffi (for mozjs-45) RPM_CHECK_LIB( -[MozJS (js-1.8.5)], [mozjs185], -[mozjs185], [JS_NewContext], [jsapi.h], -[no,external:none], [mozjs185:src:src], -[ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then - WITH_SPIDERMONKEY_SUBDIR="$WITH_JS_SUBDIR/src" - else - WITH_JS_SUBDIR=js - fi +[Libffi], [libffi], +[ffi], [ffi_prep_cif], [ffi.h], +[no,external:none], [], +[ +AC_CHECK_FUNC(ffi_call) +AC_CHECK_FUNC(ffi_call_unix64) +AC_CHECK_FUNC(ffi_closure_alloc) +AC_CHECK_FUNC(ffi_closure_free) +AC_CHECK_FUNC(ffi_closure_unix64) +AC_CHECK_FUNC(ffi_closure_unix64_inner) +AC_CHECK_FUNC(ffi_java_ptrarray_to_raw) +AC_CHECK_FUNC(ffi_java_raw_call) +AC_CHECK_FUNC(ffi_java_raw_size) +AC_CHECK_FUNC(ffi_java_raw_to_ptrarray) +AC_CHECK_FUNC(ffi_prep_cif) +AC_CHECK_FUNC(ffi_prep_cif_machdep) +AC_CHECK_FUNC(ffi_prep_cif_var) +AC_CHECK_FUNC(ffi_prep_closure) +AC_CHECK_FUNC(ffi_prep_closure_loc) +AC_CHECK_FUNC(ffi_prep_java_raw_closure) +AC_CHECK_FUNC(ffi_prep_java_raw_closure_loc) +AC_CHECK_FUNC(ffi_prep_raw_closure) +AC_CHECK_FUNC(ffi_prep_raw_closure_loc) +AC_CHECK_FUNC(ffi_ptrarray_to_raw) +AC_CHECK_FUNC(ffi_raw_call) +AC_CHECK_FUNC(ffi_raw_size) +AC_CHECK_FUNC(ffi_raw_to_ptrarray) ], []) -AC_SUBST(WITH_SPIDERMONKEY_SUBDIR) +dnl # JavaScript +WITH_JS_SUBDIR="" #WITH_SPIDERMONKEY_SUBDIR="" -#AC_LANG_PUSH(C++) #RPM_CHECK_LIB( -#[MozJS (mozjs-24)], [mozjs24], -#[mozjs-24], [_fini], [jsapi.h], -#[no,external:none], [mozjs-24:src:src], +#[MozJS (js-1.8.5)], [mozjs185], +#[mozjs185], [JS_NewContext], [jsapi.h], +#[no,external:none], [mozjs185:src:src], #[ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then #
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 11-May-2017 18:24:23 Branch: rpm-5_4 Handle: 2017051116242300 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - tcmalloc: stub in the basics. -ltcmalloc needs to be last lib linked. Summary: RevisionChanges Path 2.472.2.170 +33 -0 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.169 -r2.472.2.170 configure.ac --- rpm/configure.ac 10 May 2017 21:39:09 - 2.472.2.169 +++ rpm/configure.ac 11 May 2017 16:24:23 - 2.472.2.170 @@ -2183,6 +2183,39 @@ AC_MSG_HEADER([THIRD-PARTY LIBRARIES (2/2)]) +dnl XXX -ltcmalloc needs to be positioned after all other libraries. +dnl # TCMALLOC +RPM_CHECK_LIB( +[TCMALLOC], [tcmalloc], +[tcmalloc], [tc_version], [gperftools/tcmalloc.h], +[no,external:none], [], +[ +# XXX unneccessary with -ltcmalloc_minimal +if test \( ".`$CC --version 2>&1 | grep 'GCC'`" != . \); then +CPPFLAGS="$CPPFLAGS -fno-builtin-malloc" +CPPFLAGS="$CPPFLAGS -fno-builtin-calloc" +CPPFLAGS="$CPPFLAGS -fno-builtin-realloc" +CPPFLAGS="$CPPFLAGS -fno-builtin-free" +fi +AC_CHECK_HEADERS([gperftools/tcmalloc.h]) +AC_CHECK_FUNCS(tc_version) +AC_CHECK_FUNCS(tc_malloc) +AC_CHECK_FUNCS(tc_malloc_skip_new_handler) +AC_CHECK_FUNCS(tc_free) +AC_CHECK_FUNCS(tc_free_sized) +AC_CHECK_FUNCS(tc_realloc) +AC_CHECK_FUNCS(tc_calloc) +AC_CHECK_FUNCS(tc_cfree) +AC_CHECK_FUNCS(tc_memalign) +AC_CHECK_FUNCS(tc_posix_memalign) +AC_CHECK_FUNCS(tc_valloc) +AC_CHECK_FUNCS(tc_pvalloc) +AC_CHECK_FUNCS(tc_malloc_stats) +AC_CHECK_FUNCS(tc_mallopt) +AC_CHECK_FUNCS(tc_mallinfo) +AC_CHECK_FUNCS(tc_malloc_size) +], []) + dnl # POPT RPM_CHECK_LIB( [POPT], [popt], @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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-2017 23:17:54 Branch: rpm-5_4 Handle: 2017050821175400 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: libcap-ng. Summary: RevisionChanges Path 2.472.2.167 +20 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.166 -r2.472.2.167 configure.ac --- rpm/configure.ac 4 May 2017 15:50:04 - 2.472.2.166 +++ rpm/configure.ac 8 May 2017 21:17:54 - 2.472.2.167 @@ -3317,12 +3317,13 @@ AC_CHECK_FUNCS(attr_multi attr_multif) ], []) -dnl # Linux Capabilities +dnl # Linux libcap2 RPM_CHECK_LIB( -[Linux Capabilities], [cap], +[Linux libcap2], [cap], [cap], [cap_init], [sys/capability.h], [no,external:none], [], [ +AC_CHECK_HEADERS(linux/securebits.h) AC_CHECK_FUNCS(cap_dup cap_free cap_init) AC_CHECK_FUNCS(cap_get_flag cap_set_flag cap_clear cap_clear_flag) AC_CHECK_FUNCS(cap_get_fd cap_get_file cap_set_fd cap_set_file) @@ -,6 +3334,23 @@ AC_CHECK_FUNCS(cap_compare capset capget capgetp) ], []) +dnl # Linux libcap-ng +RPM_CHECK_LIB( +[Linux libcap-ng], [capng], +[cap-ng], [capng_clear], [cap-ng.h], +[no,external:none], [], +[ +AC_CHECK_FUNCS(capng_clear capng_fill capng_setpid) +AC_CHECK_FUNCS(capng_get_caps_process capng_update capng_updateev) +AC_CHECK_FUNCS(capng_apply capng_lock capng_change_id) +AC_CHECK_FUNCS(capng_get_caps_fd capng_apply_caps_fd) +AC_CHECK_FUNCS(capng_have_capabilities capng_have_capability) +AC_CHECK_FUNCS(capng_print_caps_numeric capng_print_caps_text) +AC_CHECK_FUNCS(capng_capability_to_name capng_name_to_capability) +AC_CHECK_FUNCS(capng_save_state capng_restore_state) +], []) + + dnl # ACL API RPM_CHECK_LIB( [ACL], [acl], @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 04-May-2017 17:50:04 Branch: rpm-5_4 Handle: 2017050415500400 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - acl: check for instead of . Summary: RevisionChanges Path 2.472.2.166 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.165 -r2.472.2.166 configure.ac --- rpm/configure.ac 3 May 2017 23:44:01 - 2.472.2.165 +++ rpm/configure.ac 4 May 2017 15:50:04 - 2.472.2.166 @@ -3336,7 +3336,7 @@ dnl # ACL API RPM_CHECK_LIB( [ACL], [acl], -[acl], [acl_free], [sys/acl.h], +[acl], [acl_free], [acl/libacl.h], [no,external:none], [], [ AC_CHECK_FUNCS(acl_t acl_init acl_t acl_dup acl_free acl_valid) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 04-May-2017 01:44:01 Branch: rpm-5_4 Handle: 2017050323440100 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - typo. Summary: RevisionChanges Path 2.472.2.165 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.164 -r2.472.2.165 configure.ac --- rpm/configure.ac 3 May 2017 23:18:17 - 2.472.2.164 +++ rpm/configure.ac 3 May 2017 23:44:01 - 2.472.2.165 @@ -3185,7 +3185,7 @@ OLIBS="$LIBS" RPM_CHECK_LIB( [SCHED], [sched], -[c], [sched-yield], [sched.h], +[c], [sched_yield], [sched.h], [no,external:none], [], [ LIBS="$OLIBS" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 04-May-2017 01:18:17 Branch: rpm-5_4 Handle: 2017050323181700 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: fix: strip out multiple -lrt and -lc occurrences in LDFLAGS. Summary: RevisionChanges Path 2.472.2.164 +36 -0 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.163 -r2.472.2.164 configure.ac --- rpm/configure.ac 21 Apr 2017 06:19:16 - 2.472.2.163 +++ rpm/configure.ac 3 May 2017 23:18:17 - 2.472.2.164 @@ -3027,11 +3027,13 @@ ], []) dnl # Glibc AIO +OLIBS="$LIBS" RPM_CHECK_LIB( [AIO], [aio], [rt], [aio_init], [aio.h], [no,external:none], [], [ + $(echo "$OLIBS" | grep -- ' -lrt' > /dev/null) && LIBS="$OLIBS" AC_CHECK_FUNC(aio_cancel) AC_CHECK_FUNC(aio_error) AC_CHECK_FUNC(aio_fsync) @@ -3044,11 +3046,13 @@ ], []) dnl # Glibc CLOCK +OLIBS="$LIBS" RPM_CHECK_LIB( [CLOCK], [clock], [rt], [clock_gettime], [time.h], [no,external:none], [], [ + $(echo "$OLIBS" | grep -- ' -lrt' > /dev/null) && LIBS="$OLIBS" AC_CHECK_FUNCS(clock_adjtime) AC_CHECK_FUNCS(clock_getcpuclockid) AC_CHECK_FUNCS(clock_getres) @@ -3058,11 +3062,13 @@ ], []) dnl # Glibc EPOLL +OLIBS="$LIBS" RPM_CHECK_LIB( [EPOLL], [epoll], [c], [epoll_create], [sys/epoll.h], [no,external:none], [], [ +LIBS="$OLIBS" AC_CHECK_FUNCS(epoll_create) AC_CHECK_FUNCS(epoll_create1) AC_CHECK_FUNCS(epoll_ctl) @@ -3071,32 +3077,38 @@ ], []) dnl # Glibc EVENTFD +OLIBS="$LIBS" RPM_CHECK_LIB( [EVENTFD], [eventfd], [c], [eventfd], [sys/eventfd.h], [no,external:none], [], [ +LIBS="$OLIBS" AC_CHECK_FUNCS(eventfd) AC_CHECK_FUNCS(eventfd_read) AC_CHECK_FUNCS(eventfd_write) ], []) dnl # Glibc FANOTIFY +OLIBS="$LIBS" RPM_CHECK_LIB( [FANOTIFY], [fanotify], [c], [fanotify_init], [sys/fanotify.h], [no,external:none], [], [ +LIBS="$OLIBS" AC_CHECK_FUNCS(fanotify_init) AC_CHECK_FUNCS(fanotify_mark) ], []) dnl # Glibc INOTIFY +OLIBS="$LIBS" RPM_CHECK_LIB( [INOTIFY], [inotify], [c], [inotify_init], [sys/inotify.h], [no,external:none], [], [ +LIBS="$OLIBS" AC_CHECK_FUNCS(inotify_init) AC_CHECK_FUNCS(inotify_init1) AC_CHECK_FUNCS(inotify_add_watch) @@ -3104,31 +3116,37 @@ ], []) dnl # Glibc IPC +OLIBS="$LIBS" RPM_CHECK_LIB( [IPC], [ipc], [c], [ftok], [sys/ipc.h], [yes,external:none], [], [ +LIBS="$OLIBS" AC_CHECK_FUNCS(ftok) ], []) dnl # Glibc MOUNT +OLIBS="$LIBS" RPM_CHECK_LIB( [MOUNT], [mount], [c], [mount], [sys/mount.h], [no,external:none], [], [ +LIBS="$OLIBS" AC_CHECK_FUNCS(mount) AC_CHECK_FUNCS(umount) AC_CHECK_FUNCS(umount2) ], []) dnl # POSIX Message Queues +OLIBS="$LIBS" RPM_CHECK_LIB( [POSIX Message Queues], [mq], [rt], [mq_open], [mqueue.h], [no,external:none], [], [ + $(echo "$OLIBS" | grep -- ' -lrt' > /dev/null) && LIBS="$OLIBS" AC_CHECK_FUNCS(mq_close) AC_CHECK_FUNCS(mq_getattr) AC_CHECK_FUNCS(mq_notify) @@ -3142,29 +3160,35 @@ ], []) dnl # Glibc PERSONALITY +OLIBS="$LIBS" RPM_CHECK_LIB( [PERSONALITY], [personality], [c], [personality], [sys/personality.h], [no,external:none], [], [ +LIBS="$OLIBS" AC_CHECK_FUNCS(personality) ], []) dnl # Glibc PRCTL +OLIBS="$LIBS" RPM_CHECK_LIB( [PRCTL], [prctl], [c], [prctl], [sys/prctl.h], [no,external:none], [], [ +LIBS="$OLIBS" AC_CHECK_FUNCS(prctl) ], []) dnl # POSIX Scheduler +OLIBS="$LIBS" RPM_CHECK_LIB( [SCHED], [sched], [c], [sched-yield], [sched.h], [no,external:none], [], [ +LIBS="$OLIBS" AC_CHECK_FUNCS(sched_getaffinity) AC_CHECK_FUNCS(sched_setaffinity) AC_CHECK_FUNCS(sched_getparam) @@
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 13-Apr-2017 17:19:23 Branch: rpm-5_4 Handle: 2017041315192300 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: detect additional I/O related syscalls. Summary: RevisionChanges Path 2.472.2.159 +10 -9 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.158 -r2.472.2.159 configure.ac --- rpm/configure.ac 6 Mar 2017 17:52:54 - 2.472.2.158 +++ rpm/configure.ac 13 Apr 2017 15:19:23 - 2.472.2.159 @@ -1571,24 +1571,25 @@ dnl strtol strtoul dnl dnl ]) AC_CHECK_FUNCS([dnl -asprintf atexit basename chflags clearenv clock_gettime dnl +asprintf atexit basename chflags clearenv clock_gettime clone dnl confstr dup2 endgrent endpwent fallocate fchdir fchflags dnl -fchmod fdatasync floor ftok ftruncate getaddrinfo dnl +fchmod fdatasync floor ftok fsync ftruncate getaddrinfo dnl getattrlist getcwd getdelim gethostbyaddr gethostbyname dnl gethostname getline getmode getmntent getmntinfo dnl getnameinfo getpass getpassphrase gettimeofday getwd dnl getxattr hasmntopt iconv inet_aton inet_ntoa isascii dnl lchflags lchmod lchown lgetxattr localtime_r lsetxattr dnl -lutimes madvise mbrlen memchr mempcpy memset mkdir dnl -mkdtemp mkfifo mkstemp mtrace munmap nl_langinfo dnl -pathconf posix_fadvise posix_fallocate pow putenv dnl -realpath regcomp rmdir rpmatch __secure_getenv secure_getenv dnl -select setattrlist setenv setmode setxattr dnl +lutimes madvise mbrlen memchr mempcpy memset mincore mkdir dnl +mkdtemp mkfifo mkstemp msync mtrace munmap nl_langinfo dnl +pathconf posix_fadvise posix_fallocate posix_madvise posix_memalign dnl +posix_memalign posix_mem_offset posix_typed_mem_open dnl +pow putenv realpath regcomp rmdir rpmatch __secure_getenv secure_getenv dnl +select sendfile setattrlist setenv setmode setns setxattr dnl sigaction sigaddset sigdelset sigemptyset sighold sigpause dnl -sigprocmask sigrelse sigsuspend setlocale socket sqrt dnl +sigprocmask sigrelse sigsuspend setlocale socket splice sqrt dnl stpcpy stpncpy strcspn strdup strerror strmode dnl strncasecmp strndup strpbrk strspn strstr strtol strtoul strtoull dnl -tzset uname dnl +tee tzset uname unshare vmsplice dnl ]) dnl # specific additional tests needed to replace Berkeley-DB db_config.h with RPM config.h @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac devtool.conf
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: 29-Dec-2016 22:52:49 Branch: rpm-5_4 Handle: 2016122921524900 Modified files: (Branch: rpm-5_4) rpm configure.ac devtool.conf Log: - sanity. Summary: RevisionChanges Path 2.472.2.156 +10 -1 rpm/configure.ac 2.365.2.112 +10 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.155 -r2.472.2.156 configure.ac --- rpm/configure.ac 27 Dec 2016 12:20:41 - 2.472.2.155 +++ rpm/configure.ac 29 Dec 2016 21:52:49 - 2.472.2.156 @@ -2542,6 +2542,16 @@ ], []) fi +dnl # Flatbuffers +AC_LANG_PUSH([C++]) +RPM_CHECK_LIB( +[Flatbuffers], [flatbuffers], +[flatbuffers], [_init], [flatbuffers/flatbuffers.h], +[no,external:none], [], +[ AC_DEFINE(WITH_FLATBUFFERS, 1, [Define to 1 if you want flatbuffers]) +], []) +AC_LANG_POP([C++]) + dnl # LibYAML (needed by the mrbgem mruby-yaml when builtin) RPM_CHECK_LIB( [YAML], [yaml], @@ -2550,7 +2560,6 @@ [ AC_DEFINE(WITH_YAML, 1, [Define to 1 if you want libYAML with mruby-yaml]) ], []) - dnl # MRuby RPM_CHECK_LIB( [MRuby], [mruby], @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.365.2.111 -r2.365.2.112 devtool.conf --- rpm/devtool.conf 23 Dec 2016 16:00:01 - 2.365.2.111 +++ rpm/devtool.conf 29 Dec 2016 21:52:49 - 2.365.2.112 @@ -897,7 +897,9 @@ #CPPFLAGS="-Wno-unused-command-line-argument -Wno-array-bounds -Wno-parentheses-equality -Wno-string-compare" #export CPPFLAGS # -- java -JAVA_HOME="/usr/java/jdk1.8.0_92" +JAVA_HOME="/usr/java/jdk1.8.0_112" +#JAVA_HOME="/usr/java/jdk1.8.0_102" +#JAVA_HOME="/usr/java/jdk1.8.0_92" #JAVA_HOME="/usr/java/jdk1.8.0_77" #JAVA_HOME="/usr/java/jdk1.8.0_74" #JAVA_HOME="/usr/java/jdk1.8.0_66" @@ -937,6 +939,11 @@ --with-libtasn1 \ --without-pakchois \ --without-gnutls \ +--with-paho \ +--with-mosquitto \ +--with-rabbitmq \ +--without-proton \ +--with-zeromq \ --with-neon=internal \ --enable-threadsafe-ssl \ --with-ssl=openssl \ @@ -977,11 +984,13 @@ --with-subversion \ --with-unixodbc \ --with-squirrel \ +--with-flatbuffers \ --with-build-extlibdep \ --with-build-maxextlibdep \ --with-valgrind \ --without-sasl2 \ --enable-openmp \ +--enable-build-sanitize-address \ --enable-build-pic \ --enable-build-versionscript \ --enable-build-warnings \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 27-Dec-2016 13:20:41 Branch: rpm-5_4 Handle: 2016122712204100 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - yaml: fix: AutoFU typo. Summary: RevisionChanges Path 2.472.2.155 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.154 -r2.472.2.155 configure.ac --- rpm/configure.ac 23 Dec 2016 16:51:37 - 2.472.2.154 +++ rpm/configure.ac 27 Dec 2016 12:20:41 - 2.472.2.155 @@ -2547,7 +2547,7 @@ [YAML], [yaml], [yaml], [yaml_emitter_initialize], [yaml.h], [no,external:none], [], -[ AC_DEFINE(WITH_MRBEMBED, 1, [Define to 1 if you want mruby with mruby-yaml]) +[ AC_DEFINE(WITH_YAML, 1, [Define to 1 if you want libYAML with mruby-yaml]) ], []) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 15-Apr-2016 20:59:24 Branch: rpm-5_4 Handle: 2016041518592400 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - update timestamp. Summary: RevisionChanges Path 2.472.2.139 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.138 -r2.472.2.139 configure.ac --- rpm/configure.ac 15 Apr 2016 18:49:38 - 2.472.2.138 +++ rpm/configure.ac 15 Apr 2016 18:59:24 - 2.472.2.139 @@ -9,7 +9,7 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) AC_INIT([rpm],[5.4.16],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2016-03-15" dnl # [-MM[-DD[ HH[:MM +PACKAGE_TIMESTAMP="2016-04-15" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 28-Mar-2016 21:13:31
Branch: rpm-5_4 Handle: 2016032819133100
Modified files: (Branch: rpm-5_4)
rpm configure.ac
Log:
- autofu: (not yet) add configuration for GNU autotests.
Summary:
RevisionChanges Path
2.472.2.137 +7 -0 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.136 -r2.472.2.137 configure.ac
--- rpm/configure.ac 21 Mar 2016 23:20:13 - 2.472.2.136
+++ rpm/configure.ac 28 Mar 2016 19:13:31 - 2.472.2.137
@@ -976,6 +976,12 @@
AC_CHECK_PROGS(LIBTOOLIZE, libtoolize glibtoolize, libtoolize)
AC_SUBST(LIBTOOLIZE)
+dnl # check for autotest
+dnl AC_CONFIG_TESTDIR([tests/auto])
+dnl AC_PATH_PROG(AUTOM4TE,autom4te,:)
+dnl AC_PATH_PROG(__FAKECHROOT, fakechroot, no, $MYPATH)
+dnl AM_CONDITIONAL(HAVE_FAKECHROOT, [test "$__FAKECHROOT" != "no"])
+
dnl # check for id -u
AC_MSG_CHECKING(whether id supports -u)
if ${__ID} -u 2>&1 > /dev/null; then
@@ -3153,6 +3159,7 @@
tests/Makefile tests/macros
tests/bson/Makefile tests/mongoc/Makefile tests/yajl/Makefile
])
+dnl tests/auto/Makefile
dnl # final step: generate output
AC_OUTPUT
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 09-Mar-2016 21:29:08 Branch: rpm-5_4 Handle: 2016030920290800 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - sanity. Summary: RevisionChanges Path 2.472.2.132 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.131 -r2.472.2.132 configure.ac --- rpm/configure.ac 25 Feb 2016 19:44:10 - 2.472.2.131 +++ rpm/configure.ac 9 Mar 2016 20:29:08 - 2.472.2.132 @@ -2745,7 +2745,7 @@ test -f /usr/bin/crux &&RPMCANONVENDOR=crux test -f /etc/ark-release && RPMCANONVENDOR=ark test -f /etc/openmamba-release && RPMCANONVENDOR=openmamba - test -r /etc/os-release && ID=$(. /etc/os-release && [ -n "$ID" ] && echo "$ID") && RPMCANONVENDOR="$ID" + test -r /etc/os-release && ID=$(. /etc/os-release && test -n "$ID" && echo "$ID") && RPMCANONVENDOR="$ID" ;; esac RPMCANONOS="$target_os_noversion" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 25-Feb-2016 20:44:10 Branch: rpm-5_4 Handle: 2016022519441000 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - more bleeping compiler flags Summary: RevisionChanges Path 2.472.2.131 +23 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.130 -r2.472.2.131 configure.ac --- rpm/configure.ac 10 May 2015 17:55:15 - 2.472.2.130 +++ rpm/configure.ac 25 Feb 2016 19:44:10 - 2.472.2.131 @@ -175,6 +175,7 @@ rpm_CFLAGS_ADD([-Wall], [RPM_CFLAGS]) rpm_CFLAGS_ADD([-W], [RPM_CFLAGS]) rpm_CFLAGS_ADD([-fdiagnostics-show-option],[RPM_CFLAGS]) + rpm_CFLAGS_ADD([-fcheck-diagnostics-color=auto], [RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wextra], [RPM_CFLAGS]) if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then @@ -212,6 +213,17 @@ dnl # rpm_CFLAGS_ADD([-Wno-unknown-pragmas],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-strict-aliasing],[RPM_CFLAGS]) + rpm_CFLAGS_ADD([-Wswitch-bool],[RPM_CFLAGS]) + rpm_CFLAGS_ADD([-Wlogical-not-parentheses],[RPM_CFLAGS]) + rpm_CFLAGS_ADD([-Wsizeof-array-argument],[RPM_CFLAGS]) + rpm_CFLAGS_ADD([-Wbool-compare],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wc90-c99-compat],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wc99-c11-compat],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wno-incompatible-pointer-types],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wno-int-conversion],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wno-discarded-qualifiers],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wno-discarded-array-qualifiers],[RPM_CFLAGS]) + dnl # --- implied by gcc -Wunused rpm_CFLAGS_ADD([-Wno-unused-function],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-unused-parameter], [RPM_CFLAGS]) @@ -415,7 +427,7 @@ dnl # rpm_CFLAGS_ADD([-fno-prefetch-loop-arrays],[RPM_CFLAGS]) dnl # --- implied by gcc -Ofast -dnl # rpm_CFLAGS_ADD([-ffast-math],[RPM_CFLAGS]) + rpm_CFLAGS_ADD([-ffast-math],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-fno-protect-parens],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-fstack-arrays],[RPM_CFLAGS]) @@ -452,6 +464,16 @@ rpm_CFLAGS_ADD([-fsanitize=integer], [RPM_CFLAGS]) rpm_CFLAGS_ADD([-fsanitize=undefined], [RPM_CFLAGS]) rpm_CFLAGS_ADD([-fsanitize=undefined-trap], [RPM_CFLAGS]) + rpm_CFLAGS_ADD([-fsanitize=float-divide-by-zero], [RPM_CFLAGS]) + rpm_CFLAGS_ADD([-fsanitize=float-cast-overflow], [RPM_CFLAGS]) + rpm_CFLAGS_ADD([-fsanitize=bounds], [RPM_CFLAGS]) + rpm_CFLAGS_ADD([-fsanitize=alignment], [RPM_CFLAGS]) + rpm_CFLAGS_ADD([-fsanitize=object-size], [RPM_CFLAGS]) + + rpm_CFLAGS_ADD([-fcheck-pointer-bounds], [RPM_CFLAGS]) + +dnl # --- -fsilkplus -lcilkrts -I.../cilkplus-4.8-install/include + rpm_CFLAGS_ADD([-fcilkplus], [RPM_CFLAGS]) elif test ".`$CC -V 2>&1 | grep 'Sun C'`" != .; then dnl # Sun Studio (usually "cc") @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 24-Feb-2015 21:23:05 Branch: rpm-5_4 Handle: 2015022420230500 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - add autoscan suggested goop. Summary: RevisionChanges Path 2.472.2.127 +116 -25rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.126 -r2.472.2.127 configure.ac --- rpm/configure.ac 17 Feb 2015 18:00:05 - 2.472.2.126 +++ rpm/configure.ac 24 Feb 2015 20:23:05 - 2.472.2.127 @@ -117,6 +117,7 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_LIBTOOL +AC_PROG_RANLIB AC_PROG_YACC AC_PATH_PROG(AS, as, as) @@ -1021,6 +1022,7 @@ dnl # standard checks AC_C_INLINE +AC_C_RESTRICT AC_C_BIGENDIAN dnl # platform-hack: don't trust darwin's configure-time check for endianness @@ -1045,17 +1047,22 @@ dnl # standard headers (generic) AC_CHECK_HEADERS([dnl -fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h dnl -signal.h stdbool.h sys/byteorder.h sys/endian.h dnl -sys/ipc.h sys/socket.h sys/select.h dnl -sys/time.h sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl -sys/utsname.h sys/prctl.h sys/wait.h netinet/in_systm.h dnl -machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl -sys/param.h sys/mount.h sys/mntctl.h sys/vmount.h dnl -err.h mcheck.h limits.h libgen.h float.h dnl -glob.h poll.h netinet/in.h arpa/inet.h dnl -langinfo.h dnl +arpa/inet.h err.h fcntl.h float.h getopt.h glob.h grp.h dnl +inttypes.h langinfo.h libgen.h libintl.h limits.h dnl +mach/mach.h malloc.h machine/types.h mcheck.h memory.h dnl +mntent.h mnttab.h netdb.h netinet/in.h netinet/in_systm.h dnl +paths.h poll.h pwd.h signal.h stdbool.h shadow.h dnl +stddef.h stdint.h stdlib.h string.h strings.h dnl +sys/acl.h sys/byteorder.h sys/endian.h sys/file.h dnl +sys/ioctl.h sys/ipc.h sys/mman.h sys/mntctl.h sys/mnttab.h dnl +sys/mount.h sys/param.h sys/prctl.h sys/resource.h dnl +sys/select.h sys/socket.h sys/statfs.h sys/statvfs.h dnl +sys/stdtypes.h sys/systemcfg.h sys/time.h sys/timeb.h dnl +sys/types.h sys/utsname.h sys/vfs.h sys/vmount.h sys/wait.h dnl +syslog.h termio.h termios.h unistd.h utime.h utmp.h utmpx.h dnl +wchar.h dnl ]) +AC_CHECK_HEADER_STDBOOL dnl # GNU gettext support AC_CHECK_HEADERS(locale.h) @@ -1232,10 +1239,15 @@ struct stat.st_atim.st__tim.tv_nsec, struct stat.st_birthtime, struct stat.st_flags]) +AC_CHECK_MEMBERS([ + struct stat.st_blksize, + struct stat.st_rdev]) +AC_STRUCT_ST_BLOCKS AC_MSG_CHECKING(if timezone is defined) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include time.h]], [[printf(%ld, timezone)]])],[HAS_TIMEZONE=yes],[HAS_TIMEZONE=no]) AC_MSG_RESULT($HAS_TIMEZONE) +AC_STRUCT_TIMEZONE dnl check for missing typedefs AC_TYPE_MODE_T @@ -1243,6 +1255,18 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T +AC_TYPE_INT32_T dnl system.h:37 +AC_TYPE_INT64_T dnl tests/bson/test-atomic.c:39 +AC_TYPE_INT8_T dnl rpmio/bson.h:619 +AC_TYPE_SSIZE_T dnl lua/local/lposix.c:791 +AC_TYPE_UID_Tdnl lua/shadow/copydir.c:153 +AC_TYPE_UINT16_T dnl tests/bson/test-endian.c:31 +AC_TYPE_UINT32_T dnl python/rpmts-py.c:361 +AC_TYPE_UINT64_T dnl tests/bson/TestSuite.c:136 +AC_TYPE_UINT8_T dnl python/rpmkeyring-py.c:36 + +AC_CHECK_TYPES([ptrdiff_t]) + dnl check size of built-in types AC_CHECK_TYPES([long long, long double]) AC_CHECK_SIZEOF(char, 1) @@ -1257,25 +1281,63 @@ AC_CHECK_SIZEOF(unsigned long long, 8) dnl linux/posix and *BSD signals differ still, sigh -AC_CHECK_TYPES([sighanlder_t, sig_t]) +AC_CHECK_TYPES([sighandler_t, sig_t]) dnl checks for library functions (specific) AC_FUNC_ALLOCA -AC_FUNC_VPRINTF AC_FUNC_MMAP +AC_FUNC_VPRINTF + +AC_FUNC_CHOWNdnl lua/shadow/copydir.c:238 +AC_FUNC_ERROR_AT_LINEdnl system.h:175 +AC_FUNC_FORK dnl rpmqv.cc:810 +AC_FUNC_FSEEKO dnl rpmio/bspatch.c:46 +AC_FUNC_GETGROUPSdnl lua/local/lposix.c:2070 +AC_FUNC_GETMNTENTdnl system.h:717 +AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINKdnl lua/shadow/commonio.c:61 +AC_FUNC_MALLOC dnl debug.h:48 +AC_FUNC_MKTIME
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 17-Feb-2015 19:00:05 Branch: rpm-5_4 Handle: 2015021718000500 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - clang: disable warning spew. Summary: RevisionChanges Path 2.472.2.126 +8 -0 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.125 -r2.472.2.126 configure.ac --- rpm/configure.ac 11 Feb 2015 22:44:36 - 2.472.2.125 +++ rpm/configure.ac 17 Feb 2015 18:00:05 - 2.472.2.126 @@ -154,6 +154,8 @@ fi ]) +RPM_CPPFLAGS= +RPM_CXXFLAGS= RPM_CFLAGS= RPM_LDFLAGS= @@ -175,8 +177,11 @@ rpm_CFLAGS_ADD([-Wextra], [RPM_CFLAGS]) if test \( .`$CC --version 21 | grep 'clang'` != . \); then + rpm_CPPFLAGS_ADD([-Wno-unused-command-line-argument], [RPM_CPPFLAGS]) rpm_CFLAGS_ADD([-Wdocumentation], [RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-documentation-deprecated-sync], [RPM_CFLAGS]) + rpm_CFLAGS_ADD([-Wno-array-bounds], [RPM_CFLAGS]) + rpm_CFLAGS_ADD([-Wno-parentheses-equality], [RPM_CFLAGS]) fi dnl # rpm_CFLAGS_ADD([-pedantic], [RPM_CFLAGS]) @@ -424,7 +429,10 @@ fi dnl # --- options below are added to RPM_CFLAGS but _NOT_ added to CFLAGS +CPPFLAGS=$CPPFLAGS $RPM_CPPFLAGS +CXXFLAGS=$CXXFLAGS $RPM_CXXFLAGS CFLAGS=$CFLAGS $RPM_CFLAGS +LDFLAGS=$LDFLAGS $RPM_LDFLAGS dnl # --- configure --enable-build-pic rpm_CFLAGS_ADD([-fPIC -DPIC], [RPM_CFLAGS]) rpm_CFLAGS_ADD([-KPIC -DPIC], [RPM_CFLAGS]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 12-Oct-2014 23:23:44
Branch: rpm-5_4 Handle: 2014101221234100
Modified files: (Branch: rpm-5_4)
rpm configure.ac
Log:
- js: stub in mozjs-{24,31} goop.
Summary:
RevisionChanges Path
2.472.2.124 +33 -2 rpm/configure.ac
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.123 -r2.472.2.124 configure.ac
--- rpm/configure.ac 9 Oct 2014 02:53:35 - 2.472.2.123
+++ rpm/configure.ac 12 Oct 2014 21:23:41 - 2.472.2.124
@@ -2208,19 +2208,50 @@
dnl # JavaScript
WITH_JS_SUBDIR=
+
WITH_SPIDERMONKEY_SUBDIR=
RPM_CHECK_LIB(
-[JavaScript], [mozjs185],
+[MozJS (js-1.8.5)], [mozjs185],
[mozjs185], [JS_NewContext], [jsapi.h],
[no,external:none], [mozjs185:src:src],
[ if test .$RPM_CHECK_LIB_LOCATION = .internal; then
WITH_SPIDERMONKEY_SUBDIR=$WITH_JS_SUBDIR/src
- AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'mozjs185'
library (-lmozjs185).])
else
WITH_JS_SUBDIR=js
fi
], [])
AC_SUBST(WITH_SPIDERMONKEY_SUBDIR)
+
+#WITH_SPIDERMONKEY_SUBDIR=
+#AC_LANG_PUSH(C++)
+#RPM_CHECK_LIB(
+#[MozJS (mozjs-24)], [mozjs24],
+#[mozjs-24], [_fini], [jsapi.h],
+#[no,external:none], [mozjs-24:src:src],
+#[ if test .$RPM_CHECK_LIB_LOCATION = .internal; then
+# WITH_SPIDERMONKEY_SUBDIR=$WITH_JS_SUBDIR/src
+# else
+# WITH_JS_SUBDIR=js
+# fi
+#], [])
+#AC_LANG_POP(C++)
+#AC_SUBST(WITH_SPIDERMONKEY_SUBDIR)
+
+#WITH_SPIDERMONKEY_SUBDIR=
+#AC_LANG_PUSH(C++)
+#RPM_CHECK_LIB(
+#[MozJS (mozjs-31)], [mozjs31],
+#[mozjs-31], [_fini], [jsapi.h],
+#[no,external:none], [mozjs-31:src:src],
+#[ if test .$RPM_CHECK_LIB_LOCATION = .internal; then
+# WITH_SPIDERMONKEY_SUBDIR=$WITH_JS_SUBDIR/src
+# else
+# WITH_JS_SUBDIR=js
+# fi
+#], [])
+#AC_LANG_POP(C++)
+#AC_SUBST(WITH_SPIDERMONKEY_SUBDIR)
+
AC_SUBST(WITH_JS_SUBDIR)
dnl # GPSEE
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac rpm/lib/ misc.c rpmversion.h.in ...
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: 28-Sep-2014 21:31:11 Branch: rpm-5_4 Handle: 2014092819310704 Modified files: (Branch: rpm-5_4) rpm configure.ac rpm/lib misc.c rpmversion.h.in rpm/perlMakefile.PL.in rpm/rpmdb rpmlio.h rpm/rpmio rpmutil.h set.c rpm/tests/mongo gridfs.c gridfs.h Log: - gcc: resurrect -fpie -pie linkage. Summary: RevisionChanges Path 2.472.2.119 +25 -17 rpm/configure.ac 2.152.6.3 +1 -1 rpm/lib/misc.c 2.3.6.1 +3 -0 rpm/lib/rpmversion.h.in 1.27.6.3+3 -1 rpm/perl/Makefile.PL.in 1.2.4.1 +18 -0 rpm/rpmdb/rpmlio.h 1.1.2.2 +22 -0 rpm/rpmio/rpmutil.h 1.1.2.12+13 -1 rpm/rpmio/set.c 1.1.2.8 +6 -2 rpm/tests/mongo/gridfs.c 1.1.2.2 +12 -6 rpm/tests/mongo/gridfs.h patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.118 -r2.472.2.119 configure.ac --- rpm/configure.ac 27 Sep 2014 15:59:05 - 2.472.2.118 +++ rpm/configure.ac 28 Sep 2014 19:31:07 - 2.472.2.119 @@ -126,8 +126,9 @@ AC_ARG_ENABLE(build-pic, AS_HELP_STRING([--enable-build-pic], [build RPM with Position Independent Code (PIC)]), [dnl if test .$enableval = .yes; then -if test .`$CC --version 21 | grep 'GCC'` != .; then -dnl # GNU GCC (usually gcc) +if test \( .`$CC --version 21 | grep 'GCC'` != . \) -o \ +\( .`$CC --version 21 | grep 'clang'` != . \); then +dnl # GNU GCC (usually gcc) or LLVM (usually clang) CFLAGS=$CFLAGS -fPIC -DPIC elif test .`$CC -V 21 | grep 'Sun C'` != .; then dnl # Sun Studio (usually cc) @@ -136,24 +137,24 @@ dnl # Intel C/C++ Compiler (usually icc) CFLAGS=$CFLAGS -fPIC -DPIC else -AC_MSG_WARN([--enable-build-pic requires GCC, Sun Studio or Intel C/C++]) +AC_MSG_WARN([--enable-build-pic requires GCC/clang, Sun Studio or Intel C/C++]) fi fi ]) AC_ARG_ENABLE(build-pie, -AS_HELP_STRING([--enable-build-pie], [build RPM as Position Independent Executable (PIE) (GCC only)]), [dnl +AS_HELP_STRING([--enable-build-pie], [build RPM as Position Independent Executable (PIE) (GCC/clang only)]), [dnl if test .$enableval = .yes; then -if test .$GCC = .yes; then - rpm_CFLAGS_ADD([-fpie], [CFLAGS]) - rpm_LDFLAGS_ADD([-pie], [LDFLAGS]) +if test \( .`$CC --version 21 | grep 'GCC'` != . \) -o \ +\( .`$CC --version 21 | grep 'clang'` != . \); then +CFLAGS=$CFLAGS -fpie + LDFLAGS=$LDFLAGS -pie else -AC_MSG_WARN([--enable-build-pie requires GCC]) +AC_MSG_WARN([--enable-build-pie requires GCC or clang]) fi fi ]) -CFLAGS=$CFLAGS $RPM_CFLAGS + RPM_CFLAGS= -LDFLAGS=$LDFLAGS $RPM_LDFLAGS RPM_LDFLAGS= AC_ARG_ENABLE(build-warnings, @@ -173,8 +174,10 @@ rpm_CFLAGS_ADD([-fdiagnostics-show-option],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wextra], [RPM_CFLAGS]) + if test \( .`$CC --version 21 | grep 'clang'` != . \); then rpm_CFLAGS_ADD([-Wdocumentation], [RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-documentation-deprecated-sync], [RPM_CFLAGS]) + fi dnl # rpm_CFLAGS_ADD([-pedantic], [RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-pedantic-errors], [RPM_CFLAGS]) @@ -208,7 +211,7 @@ rpm_CFLAGS_ADD([-Wno-unused-function],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-unused-parameter], [RPM_CFLAGS]) dnl # XXX not gcc-4.4.7 -dnl rpm_CFLAGS_ADD([-Wunused-result],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wunused-result],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-unused-value],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-unused-variable],[RPM_CFLAGS]) @@ -266,10 +269,13 @@ dnl # rpm_CFLAGS_ADD([-Wmissing-declarations],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wmissing-prototypes],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wold-style-definition],[RPM_CFLAGS]) -# XXX rpmio/set.c needs this - if test \( .`$CC --version 21 | grep 'GCC'` != . \); then -rpm_CFLAGS_ADD([-Wno-override-init], [RPM_CFLAGS]) - fi +dnl #XXX rpmio/set.c +dnl # if test \( .`$CC --version 21 | grep 'clang'` != . \); then +dnl #
[CVS] RPM: rpm-5_4: rpm/ configure.ac rpm/rpmconstant/ rpmconstant.h
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: 27-Sep-2014 17:59:05 Branch: rpm-5_4 Handle: 2014092715590500 Modified files: (Branch: rpm-5_4) rpm configure.ac rpm/rpmconstant rpmconstant.h Log: - clang: add -Wdocumentation conditionally. Summary: RevisionChanges Path 2.472.2.118 +32 -16 rpm/configure.ac 1.8.2.2 +13 -8 rpm/rpmconstant/rpmconstant.h patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.117 -r2.472.2.118 configure.ac --- rpm/configure.ac 23 Sep 2014 18:58:56 - 2.472.2.117 +++ rpm/configure.ac 27 Sep 2014 15:59:05 - 2.472.2.118 @@ -124,7 +124,7 @@ dnl # GCC specifics AC_PROG_GCC_TRADITIONAL AC_ARG_ENABLE(build-pic, -AS_HELP_STRING([--enable-build-pic], [build RPM with Position Independent Code (PIC) (GCC only)]), [dnl +AS_HELP_STRING([--enable-build-pic], [build RPM with Position Independent Code (PIC)]), [dnl if test .$enableval = .yes; then if test .`$CC --version 21 | grep 'GCC'` != .; then dnl # GNU GCC (usually gcc) @@ -145,7 +145,7 @@ if test .$enableval = .yes; then if test .$GCC = .yes; then rpm_CFLAGS_ADD([-fpie], [CFLAGS]) - rpm_LDFLAGS_ADD([-fpie], [LDFLAGS]) + rpm_LDFLAGS_ADD([-pie], [LDFLAGS]) else AC_MSG_WARN([--enable-build-pie requires GCC]) fi @@ -161,7 +161,7 @@ if test .$enableval = .yes; then if test \( .`$CC --version 21 | grep 'GCC'` != . \) -o \ \( .`$CC --version 21 | grep 'clang'` != . \); then -dnl # GNU GCC (usually gcc) +dnl # GNU GCC (usually gcc) or LLVM (usually clang) # CFLAGS=$CFLAGS -Wall -W -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts -Wno-unused-parameter -Wformat-security # XXX gcc-4.2 on Mac OS X hasn't # CFLAGS=$CFLAGS -Wno-unused-but-set-variable @@ -171,10 +171,18 @@ rpm_CFLAGS_ADD([-Wall], [RPM_CFLAGS]) rpm_CFLAGS_ADD([-W], [RPM_CFLAGS]) rpm_CFLAGS_ADD([-fdiagnostics-show-option],[RPM_CFLAGS]) -dnl : rpm_CFLAGS_ADD([-Wextra], [RPM_CFLAGS]) + rpm_CFLAGS_ADD([-Wextra], [RPM_CFLAGS]) + + rpm_CFLAGS_ADD([-Wdocumentation], [RPM_CFLAGS]) + rpm_CFLAGS_ADD([-Wno-documentation-deprecated-sync], [RPM_CFLAGS]) + +dnl # rpm_CFLAGS_ADD([-pedantic], [RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-pedantic-errors], [RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wsystem-headers],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Weverything], [RPM_CFLAGS]) dnl # === implied by gcc -Wall -rpm_CFLAGS_ADD([-Wno-char-subscripts], [RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wno-char-subscripts], [RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wcomment], [RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wcomments], [RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wformat],[RPM_CFLAGS]) @@ -193,13 +201,14 @@ dnl # rpm_CFLAGS_ADD([-Wtrigraphs],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wunused],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wuninitialized],[RPM_CFLAGS]) - rpm_CFLAGS_ADD([-Wno-unknown-pragmas],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wno-unknown-pragmas],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-strict-aliasing],[RPM_CFLAGS]) dnl # --- implied by gcc -Wunused rpm_CFLAGS_ADD([-Wno-unused-function],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-unused-parameter], [RPM_CFLAGS]) - rpm_CFLAGS_ADD([-Wno-unused-result],[RPM_CFLAGS]) +dnl # XXX not gcc-4.4.7 +dnl rpm_CFLAGS_ADD([-Wunused-result],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-unused-value],[RPM_CFLAGS]) rpm_CFLAGS_ADD([-Wno-unused-variable],[RPM_CFLAGS]) @@ -213,6 +222,12 @@ dnl # rpm_CFLAGS_ADD([-Wimplicit-function-declaration],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Werror-implicit-function-declaration],[RPM_CFLAGS]) +dnl # --- implied by clang -Wthread-safety + rpm_CFLAGS_ADD([-Wthread-safety],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wthread-safety-attributes],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wthread-safety-analysis],[RPM_CFLAGS]) +dnl # rpm_CFLAGS_ADD([-Wthread-safety-precise],[RPM_CFLAGS]) + dnl # --- other dnl # rpm_CFLAGS_ADD([-Wno-div-by-zero],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wfloat-equal],[RPM_CFLAGS]) @@ -222,10 +237,7 @@ dnl # rpm_CFLAGS_ADD([-Wunused-macros],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wendif-labels],[RPM_CFLAGS])
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 17-Aug-2014 18:49:18 Branch: rpm-5_4 Handle: 2014081716491800 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: update to gettext version in use. Summary: RevisionChanges Path 2.472.2.112 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.111 -r2.472.2.112 configure.ac --- rpm/configure.ac 16 Aug 2014 23:26:10 - 2.472.2.111 +++ rpm/configure.ac 17 Aug 2014 16:49:18 - 2.472.2.112 @@ -736,7 +736,7 @@ dnl # GNU gettext support AC_CHECK_HEADERS(locale.h) -AM_GNU_GETTEXT_VERSION(0.18.2) +AM_GNU_GETTEXT_VERSION(0.19.2) AM_GNU_GETTEXT([external]) AM_ICONV AM_CONDITIONAL(USE_NLS, [ test .$USE_NLS = .yes ]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac devtool.conf
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: 17-Aug-2014 00:56:05 Branch: rpm-5_4 Handle: 2014081622560300 Modified files: (Branch: rpm-5_4) rpm configure.ac devtool.conf Log: - perl: add -rpath /path/to/libperl.so. - java: add -rpath /path/to/libjvm.so. - java: home --without-java and --with-jvm implicitly. Summary: RevisionChanges Path 2.472.2.110 +49 -37 rpm/configure.ac 2.365.2.95 +16 -33 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.109 -r2.472.2.110 configure.ac --- rpm/configure.ac 15 Aug 2014 21:09:29 - 2.472.2.109 +++ rpm/configure.ac 16 Aug 2014 22:56:03 - 2.472.2.110 @@ -1738,7 +1738,9 @@ [Perl ExtUtils::Embed], [perlembed], [perl], [perl_alloc], [EXTERN.h], [no,external:none], [], -[ +[ if test .$RPM_CHECK_LIB_LOCATION != .internal; then + LDFLAGS=$LDFLAGS -Wl,-rpath,$RPM_CHECK_LIB_LOCATION + fi ], []) dnl # Python embedding @@ -1765,49 +1767,59 @@ AC_SUBST(WITH_RUBY_VENDORARCHDIR) dnl # Java prerequisites (swiped from db-6.1.19/dist/aclocal_java et al) -AC_CHECK_CLASSPATH -AC_JAVA_OPTIONS -AC_PROG_JAVAC -AC_PROG_JAVAH -### AC_PROG_JAR -AC_PROG_JAVA - -AC_JNI_INCLUDE_DIR -AC_MSG_CHECKING(java version) -case $JAVA in -*kaffe* ) -JAVA_VERSION=`$JAVA -version 21 | -sed -e '/Java Version:/!d' -e 's/.*Java Version: \([[^ ]]*\)[[ ]]*/\1/'` ;; -* ) JAVA_VERSION=`$JAVA -version 21 | -sed -e '/ version /!d' -e 's/.*\(.*\).*/\1/'` ;; -esac -AC_MSG_RESULT($JAVA_VERSION) -case $JAVA_VERSION in -1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;; -* ) -AC_MSG_ERROR([Java version 1.3 or higher required, got $JAVA_VERSION]) ;; -esac - -for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS -do -CPPFLAGS=$CPPFLAGS -I$JNI_INCLUDE_DIR -done -dnl # JVM (needs JNI_INCLUDE_DIR set above and JVM_LDPATH from env) -LIBSsave=$LIBS -LIBS=$LIBS -L$JVM_LDPATH +WITH_JAVA=no +AC_ARG_WITH([java], +AS_HELP_STRING([--with-java], [build RPM with java support]), +[ WITH_JAVA=$withval ], [ WITH_JAVA=no ]) +if test .$WITH_JAVA = .yes; then +if test .$JAVA_HOME != .; then +PATH=$JAVA_HOME/bin:$PATH +export PATH +fi +AC_CHECK_CLASSPATH +dnl AC_JAVA_OPTIONS +AC_PROG_JAVAC +dnl AC_PROG_JAVAH +dnl AC_PROG_JAR +AC_PROG_JAVA + +dnl AC_MSG_CHECKING(java version) +dnl case $JAVA in +dnl *kaffe* ) +dnl JAVA_VERSION=`$JAVA -version 21 | +dnl sed -e '/Java Version:/!d' -e 's/.*Java Version: \([[^ ]]*\)[[ ]]*/\1/'` ;; +dnl * ) JAVA_VERSION=`$JAVA -version 21 | +dnl sed -e '/ version /!d' -e 's/.*\(.*\).*/\1/'` ;; +dnl esac +dnl AC_MSG_RESULT($JAVA_VERSION) +dnl case $JAVA_VERSION in +dnl 1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;; +dnl * ) +dnl AC_MSG_ERROR([Java version 1.3 or higher required, got $JAVA_VERSION]) ;; +dnl esac + +AC_JNI_INCLUDE_DIR +for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS; do +CPPFLAGS=$CPPFLAGS -I$JNI_INCLUDE_DIR +done +# XXX Set --with-jvm=$JAVA_HOME/ implicitly (final / to follow symlink) +if test .$with_jvm = .; then with_jvm=$_JTOPDIR/; fi + +dnl # JVM RPM_CHECK_LIB( [JVM embedding], [jvm], [jvm], [JNI_CreateJavaVM], [jni.h], [no,external:none], [], [ - AC_CHECK_CLASS(bsh.Interpreter) + if test .$RPM_CHECK_LIB_LOCATION != .internal; then +LDFLAGS=$LDFLAGS -L$RPM_CHECK_LOCATION -Wl,-rpath,$RPM_CHECK_LOCATION +LIBS=$LIBS -ljvm + fi AC_DEFINE(WITH_JNIEMBED, 1, [Define to 1 if you want an embedded JVM]) - LDFLAGS=$LDFLAGS -L$JVM_LDPATH -Wl,-rpath -Wl,$JVM_LDPATH - LIBS=$LIBSsave -ljvm -], [ - LIBS=$LIBSsave -]) + AC_CHECK_CLASS(bsh.Interpreter) +], []) +fi dnl # MRuby RPM_CHECK_LIB( @@ . patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.365.2.94 -r2.365.2.95 devtool.conf ---
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 17-Aug-2014 01:26:10 Branch: rpm-5_4 Handle: 2014081623261000 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - jbj: java: fix: adding -rpath /path/to/libjvm.so. Summary: RevisionChanges Path 2.472.2.111 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.110 -r2.472.2.111 configure.ac --- rpm/configure.ac 16 Aug 2014 22:56:03 - 2.472.2.110 +++ rpm/configure.ac 16 Aug 2014 23:26:10 - 2.472.2.111 @@ -1813,7 +1813,7 @@ [no,external:none], [], [ if test .$RPM_CHECK_LIB_LOCATION != .internal; then -LDFLAGS=$LDFLAGS -L$RPM_CHECK_LOCATION -Wl,-rpath,$RPM_CHECK_LOCATION +LDFLAGS=$LDFLAGS -Wl,-rpath,$__rcl_dir LIBS=$LIBS -ljvm fi AC_DEFINE(WITH_JNIEMBED, 1, [Define to 1 if you want an embedded JVM]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 15-Aug-2014 21:30:14 Branch: rpm-5_4 Handle: 2014081519301300 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - git: prefer external over internal. Summary: RevisionChanges Path 2.472.2.108 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.107 -r2.472.2.108 configure.ac --- rpm/configure.ac 15 Aug 2014 01:22:35 - 2.472.2.107 +++ rpm/configure.ac 15 Aug 2014 19:30:13 - 2.472.2.108 @@ -1566,7 +1566,7 @@ RPM_CHECK_LIB( [Libgit2], [libgit2], [git2], [git_repository_open], [git2.h], -[no,internal:external:none], [libgit2:include], +[no,external:internal:none], [libgit2:include], [ AM_CONDITIONAL([WITH_LIBGIT2], [true]) if test .$RPM_CHECK_LIB_LOCATION = .internal; then @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 15-Aug-2014 23:09:30 Branch: rpm-5_4 Handle: 2014081521092900 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - java: add -rpath to libjvm.so. Summary: RevisionChanges Path 2.472.2.109 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.108 -r2.472.2.109 configure.ac --- rpm/configure.ac 15 Aug 2014 19:30:13 - 2.472.2.108 +++ rpm/configure.ac 15 Aug 2014 21:09:29 - 2.472.2.109 @@ -1803,7 +1803,7 @@ [ AC_CHECK_CLASS(bsh.Interpreter) AC_DEFINE(WITH_JNIEMBED, 1, [Define to 1 if you want an embedded JVM]) - LDFLAGS=$LDFLAGS -L$JVM_LDPATH + LDFLAGS=$LDFLAGS -L$JVM_LDPATH -Wl,-rpath -Wl,$JVM_LDPATH LIBS=$LIBSsave -ljvm ], [ LIBS=$LIBSsave @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 14-Aug-2014 20:13:21 Branch: rpm-5_4 Handle: 2014081418132000 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - java: fix: AC_PROG_JAR is full stop failure without jar. Don't test. Summary: RevisionChanges Path 2.472.2.104 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.103 -r2.472.2.104 configure.ac --- rpm/configure.ac 8 Aug 2014 22:40:39 - 2.472.2.103 +++ rpm/configure.ac 14 Aug 2014 18:13:20 - 2.472.2.104 @@ -1769,7 +1769,7 @@ AC_JAVA_OPTIONS AC_PROG_JAVAC AC_PROG_JAVAH -AC_PROG_JAR +### AC_PROG_JAR AC_PROG_JAVA AC_JNI_INCLUDE_DIR @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 15-Aug-2014 02:56:54 Branch: rpm-5_4 Handle: 2014081500565300 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: update timestamp. Summary: RevisionChanges Path 2.472.2.105 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.104 -r2.472.2.105 configure.ac --- rpm/configure.ac 14 Aug 2014 18:13:20 - 2.472.2.104 +++ rpm/configure.ac 15 Aug 2014 00:56:53 - 2.472.2.105 @@ -9,7 +9,7 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) AC_INIT([rpm],[5.4.15],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP=2014-05-03 dnl # [-MM[-DD[ HH[:MM +PACKAGE_TIMESTAMP=2014-08-13 dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 15-Aug-2014 03:00:45 Branch: rpm-5_4 Handle: 2014081501004500 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - java: fix: lose the unneeded java AutoFu baggage. Summary: RevisionChanges Path 2.472.2.106 +19 -19 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.105 -r2.472.2.106 configure.ac --- rpm/configure.ac 15 Aug 2014 00:56:53 - 2.472.2.105 +++ rpm/configure.ac 15 Aug 2014 01:00:45 - 2.472.2.106 @@ -1765,28 +1765,28 @@ AC_SUBST(WITH_RUBY_VENDORARCHDIR) dnl # Java prerequisites (swiped from db-6.1.19/dist/aclocal_java et al) - AC_CHECK_CLASSPATH - AC_JAVA_OPTIONS -AC_PROG_JAVAC -AC_PROG_JAVAH +### AC_CHECK_CLASSPATH +### AC_JAVA_OPTIONS +### AC_PROG_JAVAC +### AC_PROG_JAVAH ### AC_PROG_JAR -AC_PROG_JAVA +### AC_PROG_JAVA AC_JNI_INCLUDE_DIR -AC_MSG_CHECKING(java version) -case $JAVA in -*kaffe* ) -JAVA_VERSION=`$JAVA -version 21 | -sed -e '/Java Version:/!d' -e 's/.*Java Version: \([[^ ]]*\)[[ ]]*/\1/'` ;; -* ) JAVA_VERSION=`$JAVA -version 21 | -sed -e '/ version /!d' -e 's/.*\(.*\).*/\1/'` ;; -esac -AC_MSG_RESULT($JAVA_VERSION) -case $JAVA_VERSION in -1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;; -* ) -AC_MSG_ERROR([Java version 1.3 or higher required, got $JAVA_VERSION]) ;; -esac +### AC_MSG_CHECKING(java version) +### case $JAVA in +### *kaffe* ) +### JAVA_VERSION=`$JAVA -version 21 | +### sed -e '/Java Version:/!d' -e 's/.*Java Version: \([[^ ]]*\)[[ ]]*/\1/'` ;; +### * ) JAVA_VERSION=`$JAVA -version 21 | +### sed -e '/ version /!d' -e 's/.*\(.*\).*/\1/'` ;; +### esac +### AC_MSG_RESULT($JAVA_VERSION) +### case $JAVA_VERSION in +### 1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;; +### * ) +### AC_MSG_ERROR([Java version 1.3 or higher required, got $JAVA_VERSION]) ;; +### esac for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS do @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 15-Aug-2014 03:22:36 Branch: rpm-5_4 Handle: 2014081501223500 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - java: fix: switch to AutoFu plan B (BuildRequires: gcj). Summary: RevisionChanges Path 2.472.2.107 +19 -19 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.106 -r2.472.2.107 configure.ac --- rpm/configure.ac 15 Aug 2014 01:00:45 - 2.472.2.106 +++ rpm/configure.ac 15 Aug 2014 01:22:35 - 2.472.2.107 @@ -1765,28 +1765,28 @@ AC_SUBST(WITH_RUBY_VENDORARCHDIR) dnl # Java prerequisites (swiped from db-6.1.19/dist/aclocal_java et al) -### AC_CHECK_CLASSPATH -### AC_JAVA_OPTIONS -### AC_PROG_JAVAC -### AC_PROG_JAVAH +AC_CHECK_CLASSPATH +AC_JAVA_OPTIONS +AC_PROG_JAVAC +AC_PROG_JAVAH ### AC_PROG_JAR -### AC_PROG_JAVA +AC_PROG_JAVA AC_JNI_INCLUDE_DIR -### AC_MSG_CHECKING(java version) -### case $JAVA in -### *kaffe* ) -### JAVA_VERSION=`$JAVA -version 21 | -### sed -e '/Java Version:/!d' -e 's/.*Java Version: \([[^ ]]*\)[[ ]]*/\1/'` ;; -### * ) JAVA_VERSION=`$JAVA -version 21 | -### sed -e '/ version /!d' -e 's/.*\(.*\).*/\1/'` ;; -### esac -### AC_MSG_RESULT($JAVA_VERSION) -### case $JAVA_VERSION in -### 1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;; -### * ) -### AC_MSG_ERROR([Java version 1.3 or higher required, got $JAVA_VERSION]) ;; -### esac +AC_MSG_CHECKING(java version) +case $JAVA in +*kaffe* ) +JAVA_VERSION=`$JAVA -version 21 | +sed -e '/Java Version:/!d' -e 's/.*Java Version: \([[^ ]]*\)[[ ]]*/\1/'` ;; +* ) JAVA_VERSION=`$JAVA -version 21 | +sed -e '/ version /!d' -e 's/.*\(.*\).*/\1/'` ;; +esac +AC_MSG_RESULT($JAVA_VERSION) +case $JAVA_VERSION in +1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;; +* ) +AC_MSG_ERROR([Java version 1.3 or higher required, got $JAVA_VERSION]) ;; +esac for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS do @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 03-May-2014 08:14:48 Branch: rpm-5_4 Handle: 2014050306144800 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: update time stamp. Summary: RevisionChanges Path 2.472.2.98 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.97 -r2.472.2.98 configure.ac --- rpm/configure.ac 3 May 2014 04:53:35 - 2.472.2.97 +++ rpm/configure.ac 3 May 2014 06:14:48 - 2.472.2.98 @@ -9,7 +9,7 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) AC_INIT([rpm],[5.4.15],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP=2013-10-24 dnl # [-MM[-DD[ HH[:MM +PACKAGE_TIMESTAMP=2014-05-03 dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 17-Oct-2013 21:24:31 Branch: rpm-5_4 Handle: 2013101719243100 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: tpm-libtpm renaming consistency. Summary: RevisionChanges Path 2.472.2.93 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.92 -r2.472.2.93 configure.ac --- rpm/configure.ac 21 Sep 2013 17:54:43 - 2.472.2.92 +++ rpm/configure.ac 17 Oct 2013 19:24:31 - 2.472.2.93 @@ -1455,7 +1455,7 @@ [ if test .$RPM_CHECK_LIB_LOCATION = .internal; then WITH_LIBTPM_INTERNAL=true AC_DEFINE(HAVE_TPM_H, 1, [Define to 1 if you have the tpm.h header file.]) - AC_DEFINE(HAVE_LIBTPM, 1, [Define to 1 if you have the `tpm' library (-ltpm).]) + AC_DEFINE(HAVE_LIBTPM, 1, [Define to 1 if you have the libtpm library (-ltpm).]) fi AM_CONDITIONAL([WITH_LIBTPM], [true]) ],[ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac devtool.conf rpm/rpmio/ rpmtpm.c...
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: 09-Sep-2013 00:01:15
Branch: rpm-5_4 Handle: 2013090822011401
Modified files: (Branch: rpm-5_4)
rpm configure.ac devtool.conf
rpm/rpmio rpmtpm.c rpmtpm.h
Log:
- tpm: include tpm headers in rpmtpm.h from haltpm/*. todo++..
Summary:
RevisionChanges Path
2.472.2.91 +2 -1 rpm/configure.ac
2.365.2.83 +3 -2 rpm/devtool.conf
1.5.2.3 +0 -1 rpm/rpmio/rpmtpm.c
2.2.2.1 +12 -0 rpm/rpmio/rpmtpm.h
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.90 -r2.472.2.91 configure.ac
--- rpm/configure.ac 30 Aug 2013 19:51:45 - 2.472.2.90
+++ rpm/configure.ac 8 Sep 2013 22:01:14 - 2.472.2.91
@@ -1451,10 +1451,11 @@
dnl # IBM TPM 1.2 software emulation
RPM_CHECK_LIB(
[IBM TPM], [tpm],
-[tpm], [TPM_Init], [tpm.h],
+[tpm], [TPM_Init], [haltpm/tpm.h],
[no,external:none], [],
[ AC_DEFINE(WITH_TPM, 1, [Define if building with IBM TPM 1.2 emulator])
AM_CONDITIONAL([WITH_TPM], [true])
+ CPPFLAGS=$CPPFLAGS -I${includedir}/haltpm
],[
AM_CONDITIONAL([WITH_TPM], [false])
])
@@ .
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.365.2.82 -r2.365.2.83 devtool.conf
--- rpm/devtool.conf 20 Aug 2013 03:32:39 - 2.365.2.82
+++ rpm/devtool.conf 8 Sep 2013 22:01:14 - 2.365.2.83
@@ -740,11 +740,12 @@
--with-nss \
--with-gcrypt \
--with-tomcrypt \
---without-tpm \
+--with-tpm \
--with-libtasn1 \
--with-pakchois \
---with-gnutls \
+--without-gnutls \
--with-neon=internal \
+--with-ssl=openssl \
--with-libproxy \
--with-expat \
--with-pcre=internal \
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmtpm.c
$ cvs diff -u -r1.5.2.2 -r1.5.2.3 rpmtpm.c
--- rpm/rpmio/rpmtpm.c13 Jul 2013 20:16:37 - 1.5.2.2
+++ rpm/rpmio/rpmtpm.c8 Sep 2013 22:01:15 - 1.5.2.3
@@ -111,7 +111,6 @@
/*@unchecked@*/ /*@only@*/ /*@null@*/
rpmioPool _rpmtpmPool = NULL;
-
static rpmtpm rpmtpmGetPool(/*@null@*/ rpmioPool pool)
/*@globals _rpmtpmPool, fileSystem @*/
/*@modifies pool, _rpmtpmPool, fileSystem @*/
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmtpm.h
$ cvs diff -u -r2.2 -r2.2.2.1 rpmtpm.h
--- rpm/rpmio/rpmtpm.h12 Aug 2010 12:44:44 - 2.2
+++ rpm/rpmio/rpmtpm.h8 Sep 2013 22:01:15 - 2.2.2.1
@@ -22,6 +22,18 @@
typedef /*@refcounted@*/ struct rpmtpm_s * rpmtpm;
#if defined(_RPMTPM_INTERNAL)
+
+#define TPM_POSIX 1
+#define TPM_AES 1
+#define TPM_NV_DISK 1
+#define TPM_USE_TAG_IN_STRUCTURE1
+#define TPM_V12 1
+
+#define TPM_MAXIMUM_KEY_SIZE4096
+
+#include haltpm/tpmfunc.h
+#include haltpm/tpm_error.h/* XXX needed only by
identity.c/session.c */
+
/** \ingroup rpmio
*/
struct rpmtpm_s {
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 26-Aug-2013 23:42:02 Branch: rpm-5_4 Handle: 2013082621420100 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - fix: set ID when reading /etc/os-release. Summary: RevisionChanges Path 2.472.2.89 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.88 -r2.472.2.89 configure.ac --- rpm/configure.ac 19 Aug 2013 17:50:01 - 2.472.2.88 +++ rpm/configure.ac 26 Aug 2013 21:42:01 - 2.472.2.89 @@ -2174,7 +2174,7 @@ test -f /usr/bin/crux RPMCANONVENDOR=crux test -f /etc/ark-release RPMCANONVENDOR=ark test -f /etc/openmamba-releaseRPMCANONVENDOR=openmamba - test -r /etc/os-release . /etc/os-release [ -n $ID ] RPMCANONVENDOR=$ID + test -r /etc/os-release ID=$(. /etc/os-release [ -n $ID ] echo $ID) RPMCANONVENDOR=$ID ;; esac RPMCANONOS=$target_os_noversion @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 16-Jul-2013 00:15:49 Branch: rpm-5_4 Handle: 2013071522154800 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: require gettext-0.18.2 Summary: RevisionChanges Path 2.472.2.81 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.80 -r2.472.2.81 configure.ac --- rpm/configure.ac 9 Jul 2013 09:08:10 - 2.472.2.80 +++ rpm/configure.ac 15 Jul 2013 22:15:48 - 2.472.2.81 @@ -704,7 +704,7 @@ dnl # GNU gettext support AC_CHECK_HEADERS(locale.h) -AM_GNU_GETTEXT_VERSION(0.18.1) +AM_GNU_GETTEXT_VERSION(0.18.2) AM_GNU_GETTEXT([external]) AM_ICONV AM_CONDITIONAL(USE_NLS, [ test .$USE_NLS = .yes ]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 09-Jul-2013 11:08:11 Branch: rpm-5_4 Handle: 2013070909081000 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - sanity. Summary: RevisionChanges Path 2.472.2.80 +1 -0 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.79 -r2.472.2.80 configure.ac --- rpm/configure.ac 9 Jul 2013 04:37:24 - 2.472.2.79 +++ rpm/configure.ac 9 Jul 2013 09:08:10 - 2.472.2.80 @@ -1521,6 +1521,7 @@ ], [ AC_MSG_WARN([No Neon library found, using unsupported configuration]) ]) # Libgit2 +# XXX internal needs *.a/*.la files to merge into -lrpmmisc RPM_CHECK_LIB( [Libgit2], [libgit2], [git2], [git_repository_open], [git2.h], @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 09-Jul-2013 06:37:25 Branch: rpm-5_4 Handle: 2013070904372400 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - fix: muzzle initialized field overwritten warnings. Summary: RevisionChanges Path 2.472.2.79 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.78 -r2.472.2.79 configure.ac --- rpm/configure.ac 8 Jul 2013 19:14:30 - 2.472.2.78 +++ rpm/configure.ac 9 Jul 2013 04:37:24 - 2.472.2.79 @@ -160,7 +160,7 @@ # XXX gcc-4.2 on Mac OS X hasn't #CFLAGS=$CFLAGS -Wno-unused-but-set-variable # XXX rpmio/set.c needs this -#CFLAGS=$CFLAGS -Wno-override-init +CFLAGS=$CFLAGS -Wno-override-init elif test .`$CC -V 21 | grep 'Sun C'` != .; then dnl # Sun Studio (usually cc) CFLAGS=$CFLAGS -v @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac rpm/rpmio/ rpmltc.c rpmltc.h
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: 04-Jul-2013 02:27:44
Branch: rpm-5_4 Handle: 2013070400274300
Modified files: (Branch: rpm-5_4)
rpm configure.ac
rpm/rpmio rpmltc.c rpmltc.h
Log:
- ltc: remove directories from #includes. todo__.
Summary:
RevisionChanges Path
2.472.2.75 +2 -2 rpm/configure.ac
1.2.4.1 +2 -1 rpm/rpmio/rpmltc.c
1.2.4.2 +2 -2 rpm/rpmio/rpmltc.h
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.74 -r2.472.2.75 configure.ac
--- rpm/configure.ac 2 Jul 2013 19:55:06 - 2.472.2.74
+++ rpm/configure.ac 4 Jul 2013 00:27:43 - 2.472.2.75
@@ -1408,10 +1408,10 @@
dnl XXX FIXME: add libtomcrypt.pc
RPM_CHECK_LIB(
[TomCrypt], [tomcrypt],
-[tomcrypt], [ltc_init_multi], [tomcrypt/tomcrypt_cfg.h],
+[tomcrypt], [ltc_init_multi], [tomcrypt_cfg.h],
[no,external:none], [],
[ AC_DEFINE(WITH_TOMCRYPT, 1, [Define if building with LibTomCrypt])
- CPPFLAGS=$CPPFLAGS -DLTM_DESC -I${includedir}/tomcrypt
-I${includedir}/tommath
+ CPPFLAGS=$CPPFLAGS -I${includedir}/libtommath
LIBS=$LIBS -ltommath
], [])
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmltc.c
$ cvs diff -u -r1.2 -r1.2.4.1 rpmltc.c
--- rpm/rpmio/rpmltc.c12 Jun 2010 14:32:07 - 1.2
+++ rpm/rpmio/rpmltc.c4 Jul 2013 00:27:43 - 1.2.4.1
@@ -9,7 +9,6 @@
#define _RPMPGP_INTERNAL
#if defined(WITH_TOMCRYPT)
-#define LTM_DESC
#define _RPMLTC_INTERNAL
#include rpmltc.h
#endif
@@ -899,7 +898,9 @@
rpmltc ltc = xcalloc(1, sizeof(*ltc));
if (!oneshot) {
reg_algs();
+#if defined(LTM_DESC)
ltc_mp = ltm_desc; /* XXX tfm_desc */
+#endif
oneshot++;
}
return (void *) ltc;
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmltc.h
$ cvs diff -u -r1.2.4.1 -r1.2.4.2 rpmltc.h
--- rpm/rpmio/rpmltc.h13 Sep 2011 01:12:52 - 1.2.4.1
+++ rpm/rpmio/rpmltc.h4 Jul 2013 00:27:43 - 1.2.4.2
@@ -11,8 +11,8 @@
/* Implementation specific includes. */
#if defined(_RPMLTC_INTERNAL)
-#include tomcrypt/tomcrypt.h
-#include tommath/tommath.h
+#include tomcrypt.h
+#include tommath.h
#endif
/**
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 27-Jun-2013 14:40:11 Branch: rpm-5_4 Handle: 2013062712401100 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - micro++ Summary: RevisionChanges Path 2.472.2.73 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.72 -r2.472.2.73 configure.ac --- rpm/configure.ac 11 Sep 2012 16:09:14 - 2.472.2.72 +++ rpm/configure.ac 27 Jun 2013 12:40:11 - 2.472.2.73 @@ -8,7 +8,7 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.10],[PACKAGE_BUGREPORT_DEFAULT]) +AC_INIT([rpm],[5.4.11],[PACKAGE_BUGREPORT_DEFAULT]) PACKAGE_TIMESTAMP=2012-07-06 dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 27-May-2012 21:20:15 Branch: rpm-5_4 Handle: 2012052719201400 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: fix: ensure that GPSEE_MODULES_PATH is always set. Summary: RevisionChanges Path 2.472.2.68 +2 -3 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.67 -r2.472.2.68 configure.ac --- rpm/configure.ac 25 May 2012 15:59:36 - 2.472.2.67 +++ rpm/configure.ac 27 May 2012 19:20:14 - 2.472.2.68 @@ -1798,11 +1798,10 @@ if test .$RPM_CHECK_LIB_LOCATION = .internal; then AC_DEFINE(HAVE_GPSEE_H, 1, [Define to 1 if you have gpsee.h]) AC_DEFINE(HAVE_LIBGPSEE, 1, [Define to 1 if you have the 'gpsee' library (-ljs).]) - else - GPSEE_MODULES_PATH=$prefix/libexec/gpsee - AC_SUBST(GPSEE_MODULES_PATH) fi ], []) +GPSEE_MODULES_PATH=$prefix/libexec/gpsee +AC_SUBST(GPSEE_MODULES_PATH) dnl # Mongo dnl # XXX mostly bogus tests, but sufficient to get WITH_MONGO defined @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 18-Apr-2012 20:41:06 Branch: rpm-5_4 Handle: 2012041818410600 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - eastham: fix: older gcc doesn't support -Wno-override-init. Summary: RevisionChanges Path 2.472.2.62 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.61 -r2.472.2.62 configure.ac --- rpm/configure.ac 18 Apr 2012 17:20:21 - 2.472.2.61 +++ rpm/configure.ac 18 Apr 2012 18:41:06 - 2.472.2.62 @@ -159,7 +159,7 @@ # XXX gcc-4.2 on Mac OS X hasn't #CFLAGS=$CFLAGS -Wno-unused-but-set-variable # XXX rpmio/set.c needs this -CFLAGS=$CFLAGS -Wno-override-init +#CFLAGS=$CFLAGS -Wno-override-init elif test .`$CC -V 21 | grep 'Sun C'` != .; then dnl # Sun Studio (usually cc) CFLAGS=$CFLAGS -v @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 06-Apr-2012 08:18:45 Branch: rpm-5_4 Handle: 2012040606184500 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - typo. Summary: RevisionChanges Path 2.472.2.59 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.58 -r2.472.2.59 configure.ac --- rpm/configure.ac 2 Apr 2012 03:03:33 - 2.472.2.58 +++ rpm/configure.ac 6 Apr 2012 06:18:45 - 2.472.2.59 @@ -398,7 +398,7 @@ [ENABLE_BUILD_LAFILES], [test .$do_build_lafiles = .yes]) -dnl # optional sysmlink and parentdir dependency +dnl # optional symlink and parentdir dependency AC_ARG_ENABLE( [dirname-and-symlink-deps], AS_HELP_STRING([--disable-dirname-and-symlink-deps],[permit to disable via macro the automatic dirname and symlink dependecy]), @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 25-Mar-2012 22:27:40 Branch: rpm-5_4 Handle: 2012032520273900 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - set: orphan check-in. Summary: RevisionChanges Path 2.472.2.57 +2 -0 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.56 -r2.472.2.57 configure.ac --- rpm/configure.ac 22 Mar 2012 00:41:40 - 2.472.2.56 +++ rpm/configure.ac 25 Mar 2012 20:27:39 - 2.472.2.57 @@ -158,6 +158,8 @@ CFLAGS=$CFLAGS -Wall -W -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts -Wno-unused-parameter -Wformat-security # XXX gcc-4.2 on Mac OS X hasn't #CFLAGS=$CFLAGS -Wno-unused-but-set-variable +# XXX rpmio/set.c needs this +CFLAGS=$CFLAGS -Wno-override-init elif test .`$CC -V 21 | grep 'Sun C'` != .; then dnl # Sun Studio (usually cc) CFLAGS=$CFLAGS -v @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 21-Mar-2012 22:21:12 Branch: rpm-5_4 Handle: 2012032121211100 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - odbc: orphan. Summary: RevisionChanges Path 2.472.2.55 +1 -0 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.54 -r2.472.2.55 configure.ac --- rpm/configure.ac 17 Mar 2012 03:42:30 - 2.472.2.54 +++ rpm/configure.ac 21 Mar 2012 21:21:11 - 2.472.2.55 @@ -1565,6 +1565,7 @@ [odbc], [SQLAllocHandle], [sqlext.h], [no,external:none], [], [ AC_DEFINE(WITH_UNIXODBC, 1, [Define if building with UnixODBC]) + AM_CONDITIONAL([WITH_UNIXODBC], [true]) ], []) dnl # Berkeley-DB SQLite @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 22-Mar-2012 01:41:41 Branch: rpm-5_4 Handle: 2012032200414000 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: odbc: fix: ensure WITH_UNIXODBC is always defined. Summary: RevisionChanges Path 2.472.2.56 +3 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.55 -r2.472.2.56 configure.ac --- rpm/configure.ac 21 Mar 2012 21:21:11 - 2.472.2.55 +++ rpm/configure.ac 22 Mar 2012 00:41:40 - 2.472.2.56 @@ -1566,7 +1566,9 @@ [no,external:none], [], [ AC_DEFINE(WITH_UNIXODBC, 1, [Define if building with UnixODBC]) AM_CONDITIONAL([WITH_UNIXODBC], [true]) -], []) +], +[ AM_CONDITIONAL([WITH_UNIXODBC], [false]) +]) dnl # Berkeley-DB SQLite DBLIBSRCS= @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 17-Mar-2012 04:42:31 Branch: rpm-5_4 Handle: 2012031703423000 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - autofu: add --with-unixodbc. Summary: RevisionChanges Path 2.472.2.54 +8 -0 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.53 -r2.472.2.54 configure.ac --- rpm/configure.ac 11 Mar 2012 16:30:21 - 2.472.2.53 +++ rpm/configure.ac 17 Mar 2012 03:42:30 - 2.472.2.54 @@ -1559,6 +1559,14 @@ [ AM_CONDITIONAL(WITH_FILE_INTERNAL, [ false ]) ]) +# UnixODBC +RPM_CHECK_LIB( +[UnixODBC], [unixodbc], +[odbc], [SQLAllocHandle], [sqlext.h], +[no,external:none], [], +[ AC_DEFINE(WITH_UNIXODBC, 1, [Define if building with UnixODBC]) +], []) + dnl # Berkeley-DB SQLite DBLIBSRCS= # XXX won't handle --includedir override @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 11-Mar-2012 17:30:22
Branch: rpm-5_4 Handle: 2012031116302100
Modified files: (Branch: rpm-5_4)
rpm configure.ac
Log:
- autofu: fix: make sure __RMDIR gets filled in.
Summary:
RevisionChanges Path
2.472.2.53 +1 -1 rpm/configure.ac
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.52 -r2.472.2.53 configure.ac
--- rpm/configure.ac 10 Mar 2012 19:42:28 - 2.472.2.52
+++ rpm/configure.ac 11 Mar 2012 16:30:21 - 2.472.2.53
@@ -463,7 +463,6 @@
dnl # see if we have a mkdir(1) that supports option -p.
AC_PATH_PROGS(MKDIR, mkdir, mkdir)
-AC_PATH_PROGS(RMDIR, rmdir, rmdir)
AC_MSG_CHECKING([if $MKDIR supports -p])
rm -rf conftest
__MKDIR_P=
@@ -602,6 +601,7 @@
AC_PATH_PROG(__PHP, php, %{_bindir}/php, $MYPATH)
AC_PATH_PROG(__PYTHON, python, %{_bindir}/python, $MYPATH)
AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
+AC_PATH_PROG(__RMDIR, rmdir, /bin/rmdir, $MYPATH)
AC_PATH_PROG(__RSH, rsh, %{_bindir}/rsh, $MYPATH)
AC_PATH_PROG(__RUBY, ruby, %{_bindir}/ruby, $MYPATH)
AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 05-Mar-2012 19:26:35
Branch: rpm-5_4 Handle: 2012030518263500
Modified files: (Branch: rpm-5_4)
rpm configure.ac
Log:
- fix: -lmozjs185 instead of -ljs for GPSEE linkage.
Summary:
RevisionChanges Path
2.472.2.50 +1 -1 rpm/configure.ac
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.49 -r2.472.2.50 configure.ac
--- rpm/configure.ac 5 Mar 2012 16:53:57 - 2.472.2.49
+++ rpm/configure.ac 5 Mar 2012 18:26:35 - 2.472.2.50
@@ -1747,7 +1747,7 @@
[no,external:internal:none], [gpsee],
[ AC_DEFINE(WITH_GPSEE, 1, [Define to 1 if to use GPSEE as the embedded
JS interpreter])
CPPFLAGS=$CPPFLAGS -I${includedir}/js
- LIBS=$LIBS -ljs
+ LIBS=$LIBS -lmozjs185
if test .$RPM_CHECK_LIB_LOCATION = .internal; then
AC_DEFINE(HAVE_GPSEE_H, 1, [Define to 1 if you have gpsee.h])
AC_DEFINE(HAVE_LIBGPSEE, 1, [Define to 1 if you have the 'gpsee'
library (-ljs).])
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 04-Mar-2012 18:48:38 Branch: rpm-5_4 Handle: 2012030417483800 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - fix: --with-libgit2=internal builds in subdir. Summary: RevisionChanges Path 2.472.2.47 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.46 -r2.472.2.47 configure.ac --- rpm/configure.ac 4 Mar 2012 17:02:19 - 2.472.2.46 +++ rpm/configure.ac 4 Mar 2012 17:48:38 - 2.472.2.47 @@ -1489,7 +1489,7 @@ RPM_CHECK_LIB( [Libgit2], [libgit2], [git2], [git_repository_open], [git2.h], -[no,internal:external:none], [build:include], +[no,internal:external:none], [libgit2:include:build], [ AC_DEFINE(WITH_LIBGIT2, 1, [Define if building with Libgit2]) if test .$RPM_CHECK_LIB_LOCATION = .internal; then AC_DEFINE(HAVE_GIT2_H, 1, [Define to 1 if you have git2.h]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 26-Feb-2012 16:52:31 Branch: rpm-5_4 Handle: 2012022615523000 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: - macosx: gcc-4.2 doesn't support -Wno-unused-but-set-variable Summary: RevisionChanges Path 2.472.2.39 +2 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.38 -r2.472.2.39 configure.ac --- rpm/configure.ac 23 Feb 2012 23:10:01 - 2.472.2.38 +++ rpm/configure.ac 26 Feb 2012 15:52:30 - 2.472.2.39 @@ -156,7 +156,8 @@ if test .`$CC --version 21 | grep 'GCC'` != .; then dnl # GNU GCC (usually gcc) CFLAGS=$CFLAGS -Wall -W -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts -Wno-unused-parameter -Wformat-security -CFLAGS=$CFLAGS -Wno-unused-but-set-variable +# XXX gcc-4.2 on Mac OS X hasn't +#CFLAGS=$CFLAGS -Wno-unused-but-set-variable elif test .`$CC -V 21 | grep 'Sun C'` != .; then dnl # Sun Studio (usually cc) CFLAGS=$CFLAGS -v @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 27-Feb-2012 00:26:40
Branch: rpm-5_4 Handle: 2012022623264000
Modified files: (Branch: rpm-5_4)
rpm configure.ac
Log:
- libtommath: typo in -I option.
Summary:
RevisionChanges Path
2.472.2.40 +1 -1 rpm/configure.ac
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.39 -r2.472.2.40 configure.ac
--- rpm/configure.ac 26 Feb 2012 15:52:30 - 2.472.2.39
+++ rpm/configure.ac 26 Feb 2012 23:26:40 - 2.472.2.40
@@ -1375,7 +1375,7 @@
[tomcrypt], [ltc_init_multi], [tomcrypt/tomcrypt_cfg.h],
[no,external:none], [],
[ AC_DEFINE(WITH_TOMCRYPT, 1, [Define if building with LibTomCrypt])
- CPPFLAGS=$CPPFLAGS -I${includedir}/tomcrypt -I${includedir}/tommmath
+ CPPFLAGS=$CPPFLAGS -I${includedir}/tomcrypt -I${includedir}/tommath
], [])
dnl # IBM TPM 1.2 software emulation
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 09-Jan-2011 03:27:52
Branch: rpm-5_4 Handle: 2011010902265717
Modified files: (Branch: rpm-5_4)
rpm configure.ac devtool.conf
Log:
add --with-path-premacros option to get reproducible builds with
devtool target
Summary:
RevisionChanges Path
2.472.2.6 +15 -0 rpm/configure.ac
2.365.2.3 +1 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.5 -r2.472.2.6 configure.ac
--- rpm/configure.ac 29 Dec 2010 15:02:48 - 2.472.2.5
+++ rpm/configure.ac 9 Jan 2011 02:26:57 - 2.472.2.6
@@ -2156,6 +2156,21 @@
AC_MSG_RESULT([$SYSCONFIGDIR])
dnl # determine RPM macro files path
+AC_MSG_CHECKING([for RPM pre-macro files path])
+AC_ARG_WITH(
+[path-premacros],
+AS_HELP_STRING([--with-path-premacros=ARG], [build with colon-separated
RPM pre-macro files path]),
+[if test .$withval != .no; then
+ PREMACROFILES=$withval
+ AC_DEFINE_UNQUOTED(
+ [PREMACROFILES], [$PREMACROFILES],
+ [Colon separated RPM pre-macro files path])
+AC_MSG_RESULT([$PREMACROFILES])
+else
+AC_MSG_RESULT(no)
+fi]
+)
+
AC_MSG_CHECKING([for RPM macro files path])
MACROFILES=${USRLIBRPM}/macros
MACROFILES=${MACROFILES}:${USRLIBRPM}/%{_target}/macros
@@ .
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.365.2.2 -r2.365.2.3 devtool.conf
--- rpm/devtool.conf 27 Dec 2010 17:13:28 - 2.365.2.2
+++ rpm/devtool.conf 9 Jan 2011 02:27:14 - 2.365.2.3
@@ -807,6 +807,7 @@
--with-valgrind \
--with-cpuinfo \
--with-vendor=mandriva \
+ --with-path-premacros=/etc/rpm/premacros.d \
--enable-build-pic \
--enable-build-versionscript \
--enable-build-warnings \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
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: 09-Jan-2011 04:55:22
Branch: rpm-5_4 Handle: 2011010903552100
Modified files: (Branch: rpm-5_4)
rpm configure.ac
Log:
- jbj: revert pre-macros.
Summary:
RevisionChanges Path
2.472.2.7 +0 -15 rpm/configure.ac
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.6 -r2.472.2.7 configure.ac
--- rpm/configure.ac 9 Jan 2011 02:26:57 - 2.472.2.6
+++ rpm/configure.ac 9 Jan 2011 03:55:21 - 2.472.2.7
@@ -2156,21 +2156,6 @@
AC_MSG_RESULT([$SYSCONFIGDIR])
dnl # determine RPM macro files path
-AC_MSG_CHECKING([for RPM pre-macro files path])
-AC_ARG_WITH(
-[path-premacros],
-AS_HELP_STRING([--with-path-premacros=ARG], [build with colon-separated
RPM pre-macro files path]),
-[if test .$withval != .no; then
- PREMACROFILES=$withval
- AC_DEFINE_UNQUOTED(
- [PREMACROFILES], [$PREMACROFILES],
- [Colon separated RPM pre-macro files path])
-AC_MSG_RESULT([$PREMACROFILES])
-else
-AC_MSG_RESULT(no)
-fi]
-)
-
AC_MSG_CHECKING([for RPM macro files path])
MACROFILES=${USRLIBRPM}/macros
MACROFILES=${MACROFILES}:${USRLIBRPM}/%{_target}/macros
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 23-Dec-2010 16:49:06 Branch: rpm-5_4 Handle: 2010122315490600 Modified files: (Branch: rpm-5_4) rpm configure.ac Log: support using setproctitle() from libsetproctitle Summary: RevisionChanges Path 2.472.2.2 +8 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.1 -r2.472.2.2 configure.ac --- rpm/configure.ac 6 Dec 2010 23:04:47 - 2.472.2.1 +++ rpm/configure.ac 23 Dec 2010 15:49:06 - 2.472.2.2 @@ -802,7 +802,7 @@ getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl posix_fadvise posix_fallocate putenv realpath regcomp __secure_getenv dnl -setattrlist setenv setlocale setmode setproctitle setxattr dnl +setattrlist setenv setlocale setmode setxattr dnl sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl sigprocmask sigsuspend sigaction dnl stpcpy stpncpy strcspn strdup strerror strmode strndup strspn strstr dnl @@ -839,6 +839,13 @@ done fi +AC_CHECK_FUNCS(setproctitle) +if test $ac_cv_func_setproctitle = no; then + # setproctitle is not in the default libraries. See if it's in some other. + AC_CHECK_LIB(setproctitle, setproctitle, [AC_DEFINE(HAVE_SETPROCTITLE) + LIBS=$LIBS -lsetproctitle]) +fi + dnl # Check how to find out the amount of physical memory in the system. The dnl # xz command line tool uses this to automatically limit its memory usage. dnl # - sysconf() gives all the needed info on GNU+Linux and Solaris. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
