OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Aug-2003 17:27:49
Branch: HEAD Handle: 2003080716274800
Added files:
openpkg-src/snmp snmp.patch
Modified files:
openpkg-src/snmp snmp.spec
Log:
pick correct db library, patch away conflict with setenv function
(which is irregularily exported by librpmio on some systems)
Summary:
Revision Changes Path
1.1 +23 -0 openpkg-src/snmp/snmp.patch
1.51 +11 -1 openpkg-src/snmp/snmp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/snmp/snmp.patch
============================================================================
$ cvs diff -u -r0 -r1.1 snmp.patch
--- /dev/null 2003-08-07 17:27:49.000000000 +0200
+++ snmp.patch 2003-08-07 17:27:49.000000000 +0200
@@ -0,0 +1,23 @@
+--- snmplib/system.c.dist Thu Aug 7 16:42:30 2003
++++ snmplib/system.c Thu Aug 7 16:44:19 2003
+@@ -751,7 +751,7 @@
+
+ #ifndef HAVE_SETENV
+ int
+-setenv(const char *name, const char *value, int overwrite)
++__netsnmp_setenv(const char *name, const char *value, int overwrite)
+ {
+ char *cp;
+ int ret;
+--- include/net-snmp/library/system.h.dist Thu Aug 7 16:41:56 2003
++++ include/net-snmp/library/system.h Thu Aug 7 16:44:45 2003
+@@ -87,7 +87,8 @@
+ char *strdup(const char *);
+ #endif
+ #ifndef HAVE_SETENV
+- int setenv(const char *, const char *, int);
++ int __netsnmp_setenv(const char *, const char *, int);
++# define setenv(a,b,c) __netsnmp_setenv(a,b,c)
+ #endif
+
+ int calculate_time_diff(struct timeval *,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/snmp/snmp.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 snmp.spec
--- openpkg-src/snmp/snmp.spec 7 Aug 2003 11:39:25 -0000 1.50
+++ openpkg-src/snmp/snmp.spec 7 Aug 2003 15:27:48 -0000 1.51
@@ -44,6 +44,7 @@
Source1: rc.snmp
Source2: snmpd.conf
Source3: fsl.snmp
+Patch0: snmp.patch
# build information
Prefix: %{l_prefix}
@@ -69,22 +70,31 @@
%prep
# unpack and patch package
%setup -q -n net-snmp-%{version}
+ %patch -p0
%{l_shtool} subst \
-e 's;/usr/include/rpm;%{l_prefix}/include/rpm;g' \
-e 's;-lpopt\([^a-z]\);-lrpmpopt\1;g' \
- -e 's;-ldb\([^a-z]\);-lrpmdb\1;g' \
+ -e 's;db-3\.1;rpmdb;g' \
-e 's;-lz\([^a-z]\);-lrpz\1;g' \
-e 's;-lrpm\([^a-z]\);-lrpm -lrpmio\1;g' \
-e 's;-lrpmio\([^a-z]\);-lrpmio -lrpmpopt -lrpmbz2 -lrpmz\1;g' \
configure
%build
+ # disable search for db library
+ ( echo "ac_cv_lib_db1_dbopen=no"
+ echo "ac_cv_lib_db_dbopen=no"
+ echo "ac_cv_lib_rpmdb_db_create=yes"
+ echo "ac_cv_lib_db_3_0_db_create=no"
+ ) >config.cache
+
# configure package
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
./configure \
+ --cache-file=./config.cache \
--with-cc="%{l_cc}" \
--with-cflags="%{l_cflags -O}" \
--with-ldflags="%{l_ldflags} %{l_fsl_ldflags}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
