Changeset 1007

Timestamp:

Feb 20, 2017, 12:29:26 AM (8 years ago)

Author:

dmik

Message:

rpm: Get rid of ignored visibility(hidden) and fPIC on OS/2.

This fixes tons of annoying warnings during compilation.

Location:

rpm/trunk

Files:

• configure.ac (modified) (14 diffs)
• rpmio/rpmutil.h (modified) (1 diff)

rpm/trunk/configure.ac

@@ -50 +50 @@
         CFLAGS=$old_cflags
     done
-    CFLAGS="$CFLAGS -fPIC -DPIC -D_REENTRANT -Wall -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes $RPMCFLAGS"
+    case "$host" in
+        *os2*) ;;
+        *)
+           CFLAGS="$CFLAGS -fPIC -DPIC" ;;
+    esac
+    CFLAGS="$CFLAGS -D_REENTRANT -Wall -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes $RPMCFLAGS"
 fi
 export CFLAGS
@@ -67 +72 @@
 if test "$a" = "-rwxr-xr-x"; then
     AC_MSG_RESULT(yes)
-    FIXPERMS=a+rX,u+w,g-w,o-w 
+    FIXPERMS=a+rX,u+w,g-w,o-w
 else
     AC_MSG_RESULT(no (tell your OS vendor about GNU fileutils))
-    FIXPERMS=a+r,u+w,g-w,o-w 
+    FIXPERMS=a+r,u+w,g-w,o-w
 fi
 AC_SUBST(FIXPERMS)
@@ -128 +133 @@
 AC_PATH_PROG(__PERL, perl, /usr/bin/perl, $MYPATH)
 AC_PATH_PROG(__PGP, pgp, /usr/bin/pgp, $MYPATH)
-AC_PATH_PROG(__PYTHON, python, /usr/bin/python, $MYPATH) 
+AC_PATH_PROG(__PYTHON, python, /usr/bin/python, $MYPATH)
 AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
 AC_PATH_PROG(__RSH, rsh, /usr/bin/rsh, $MYPATH)
@@ -152 +157 @@
 dnl see if we have a mkdir that supports `-p' for rpmbuild's purposes
 AC_PROG_MKDIR_P
-if ! echo $MKDIR_P | grep -q mkdir; then 
+if ! echo $MKDIR_P | grep -q mkdir; then
   __MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`"
 else
@@ -163 +168 @@
 
 #=================
-# Check for zlib library. 
+# Check for zlib library.
 
 WITH_ZLIB_INCLUDE=
@@ -171 +176 @@
   AS_IF([test -z "${WITH_ZLIB_LIB}"],[
     for zlib in z gz ; do
-      AC_CHECK_LIB(${zlib}, gzread, 
+      AC_CHECK_LIB(${zlib}, gzread,
         [WITH_ZLIB_LIB="-l${zlib}"; break])
     done
@@ -264 +269 @@
       WITH_BEECRYPT_LIB="-lbeecrypt"
     ],[
-      AC_MSG_ERROR([missing required library 'beecrypt']) 
+      AC_MSG_ERROR([missing required library 'beecrypt'])
     ])
     AC_CHECK_HEADER([beecrypt/api.h], [AC_DEFINE(HAVE_BEECRYPT_API_H, 1, [Define to 1 if you have the <beecrypt/api.h> header file.])
@@ -275 +280 @@
 #=================
 # Check for NSS library.
-# We need nss.h from NSS which needs nspr.h. Unfortunately both glibc and NSS 
-# have a header named nss.h... so make extra check for NSS's sechash.h 
+# We need nss.h from NSS which needs nspr.h. Unfortunately both glibc and NSS
+# have a header named nss.h... so make extra check for NSS's sechash.h
 # which we use too and hopefully is slightly more unique to NSS.
 WITH_NSS_INCLUDE=
@@ -307 +312 @@
       WITH_MAGIC_LIB="-lmagic"
     ],[
-      AC_MSG_ERROR([missing required library 'libmagic']) 
+      AC_MSG_ERROR([missing required library 'libmagic'])
     ])
 ],[
-      AC_MSG_ERROR([missing required header magic.h]) 
+      AC_MSG_ERROR([missing required header magic.h])
 ])
 
@@ -379 +384 @@
         #endif
       ])
-    ],[ WITH_DB_LIB=-ldb ], 
+    ],[ WITH_DB_LIB=-ldb ],
       [ AC_MSG_ERROR([Berkeley DB version >= 4.5 required])
     ])
@@ -727 +732 @@
 
 AS_IF([test "$with_acl" = yes],[
-  dnl verification uses non-portable acl_equiv_mode() 
+  dnl verification uses non-portable acl_equiv_mode()
   AC_CHECK_HEADER([acl/libacl.h],[
     AC_CHECK_LIB(acl,[acl_equiv_mode],[with_acl=yes],[
@@ -804 +809 @@
 dnl permit overriding build_vendor for "canonical rpm vendor"
 RPMCANONVENDOR="$build_vendor"
-AC_ARG_WITH([vendor], 
+AC_ARG_WITH([vendor],
   AS_HELP_STRING([--with-vendor=VENDOR], [specify rpm vendor name]),
   [RPMCANONVENDOR=$withval])
 AC_DEFINE_UNQUOTED([RPMCANONVENDOR],["${RPMCANONVENDOR}"],[canonical vendor])
-           
+
 RPMCANONOS="$host_os_noversion"
 RPMCANONGNU="$host_os_gnu"
@@ -816 +821 @@
 
 RUNDIR="/run"
-AC_ARG_WITH([rundir], 
+AC_ARG_WITH([rundir],
   AS_HELP_STRING([--with-rundir=RUNDIR], [specify run-time variable directory]),
   [RUNDIR=$withval])
@@ -848 +853 @@
         rpmio/Makefile lib/Makefile build/Makefile sign/Makefile
         po/Makefile.in scripts/Makefile fileattrs/Makefile
-        misc/Makefile 
+        misc/Makefile
         doc/Makefile
         python/Makefile

rpm/trunk/rpmio/rpmutil.h

@@ -97 +97 @@
 #endif /* __GNUC__ */
 
-#if    __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
+#if    (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && !defined(__OS2__)
 #  define RPM_GNUC_INTERNAL __attribute__((visibility("hidden")))
 #else