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: 23-Sep-2014 20:58:57
Branch: rpm-5_4 Handle: 2014092318585501
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac devtool.conf
Log:
- gcc: make peace with 4.8.2.
Summary:
Revision Changes Path
1.3501.2.449+1 -0 rpm/CHANGES
2.472.2.117 +7 -3 rpm/configure.ac
2.365.2.100 +5 -3 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.448 -r1.3501.2.449 CHANGES
--- rpm/CHANGES 21 Sep 2014 21:40:54 -0000 1.3501.2.448
+++ rpm/CHANGES 23 Sep 2014 18:58:55 -0000 1.3501.2.449
@@ -1,4 +1,5 @@
5.4.15 -> 5.4.16:
+ - jbj: gcc: make peace with 4.8.2.
- jbj: sed: add sed(1) (at least s/foo/bar/) object and macro embedding.
- jbj: rpmpopt: fix: add an '@' lead-in --qf args that begin with '/'.
- devzero2000: alias -P on --provides
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.116 -r2.472.2.117 configure.ac
--- rpm/configure.ac 23 Sep 2014 08:53:37 -0000 2.472.2.116
+++ rpm/configure.ac 23 Sep 2014 18:58:56 -0000 2.472.2.117
@@ -255,7 +255,9 @@
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 2>&1 | grep 'GCC'`" != . \); then
rpm_CFLAGS_ADD([-Wno-override-init], [RPM_CFLAGS])
+ fi
dnl # rpm_CFLAGS_ADD([-Wpointer-to-int-cast],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wno-strict-prototypes],[RPM_CFLAGS])
@@ -273,7 +275,9 @@
dnl # rpm_CFLAGS_ADD([-Wsuggest-attribute=const],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wsuggest-attribute=noreturn],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wsuggest-attribute=pure],[RPM_CFLAGS])
+ if test \( ".`$CC --version 2>&1 | grep 'GCC'`" != . \); then
rpm_CFLAGS_ADD([-Wno-unused-but-set-variable], [RPM_CFLAGS])
+ fi
dnl # rpm_CFLAGS_ADD([-Wdouble-promotion],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wvariadic-macros],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wvla],[RPM_CFLAGS])
@@ -470,7 +474,7 @@
dnl # Add -fsanitize=memory (clang)
AC_ARG_ENABLE(build-sanitize-memory,
- AS_HELP_STRING([--enable-build-sanitize-memory], [build RPM instrumented
for with MemoryChecker]), [dnl
+ AS_HELP_STRING([--enable-build-sanitize-memory], [build RPM instrumented
for with MemorySanitizer]), [dnl
if test ".$enableval" = .yes; then
if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then
rpm_CFLAGS_ADD([-fsanitize=memory
-fsanitize-memory-track-origins=2 -fno-omit-frame-pointer], [CFLAGS])
@@ -479,8 +483,8 @@
])
dnl # Add -fsanitize=thread (clang)
-AC_ARG_ENABLE(build-sanitize-address,
- AS_HELP_STRING([--enable-build-sanitize-address], [build RPM
instrumented for with AddressSanitizer]), [dnl
+AC_ARG_ENABLE(build-sanitize-thread,
+ AS_HELP_STRING([--enable-build-sanitize-thread], [build RPM instrumented
for with ThreadSanitizer]), [dnl
if test ".$enableval" = .yes; then
if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then
rpm_CFLAGS_ADD([-fsanitize=thread], [CFLAGS])
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.365.2.99 -r2.365.2.100 devtool.conf
--- rpm/devtool.conf 17 Sep 2014 02:08:17 -0000 2.365.2.99
+++ rpm/devtool.conf 23 Sep 2014 18:58:56 -0000 2.365.2.100
@@ -727,8 +727,8 @@
export CC
CXX=clang++
export CXX
- #JAVA_HOME="/usr/java/jdk1.8.0_11"
- JAVA_HOME="/usr/java/jdk1.7.0_03"
+ JAVA_HOME="/usr/java/jdk1.8.0_11"
+ #JAVA_HOME="/usr/java/jdk1.7.0_03"
export JAVA_HOME
%autogen
%configure \
@@ -811,7 +811,9 @@
--enable-build-sanitize-address \
--enable-maintainer-mode
-# --enable-build-sanitize-address
+# --enable-build-gcov \
+# --enable-build-sanitize-address \
+#
# Momonga 7
%momonga
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
