diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2006-11-07 04:20:19 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2006-11-07 04:20:19 +0000 |
| commit | 6b0713023b625336b49d3c6daeac16c4a6388f43 (patch) | |
| tree | 07286159e8ad9896bf0712851313e08dcd3a9f33 | |
| parent | 891043bf95a5973198fc42068adaf72ef2163e4d (diff) | |
| download | ds-6b0713023b625336b49d3c6daeac16c4a6388f43.tar.gz ds-6b0713023b625336b49d3c6daeac16c4a6388f43.tar.xz ds-6b0713023b625336b49d3c6daeac16c4a6388f43.zip | |
1) Fedora Core 6 build fixes
FC 6 does not have /usr/include/linux/sys.h. The two files in the diff below include it, but I'm not sure why. If you look at the file on an earlier system, it appears that there is nothing in it. All it seems to do is define NR_syscalls, which is not used anywhere in any include file that I can find, nor in any ds code. So I propose changing the code not to include this file.
2) Change version to 1.0.4
I already got the other files, except for ldap/cm/Makefile
| -rw-r--r-- | ldap/cm/Makefile | 6 | ||||
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/dblayer.c | 1 | ||||
| -rw-r--r-- | ldap/systools/idsktune.c | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index e04d7e30..603f5124 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -110,9 +110,9 @@ endif endif ifdef USE_64 -VERSION=-ver 1.0.3-64bit +VERSION=-ver 1.0.4-64bit else -VERSION=-ver 1.0.3 +VERSION=-ver 1.0.4 endif ifeq ($(ARCH), HPUX) @@ -276,7 +276,7 @@ PACKAGE_SETUP_LIBS_32=$(subst $(NS64TAG),,$(PACKAGE_SETUP_LIBS)) ifdef BUILD_RPM # name and version of RPM - must correspond to the spec file - these get branded RPM_BASE_NAME=fedora - RPM_VERSION=1.0.3 + RPM_VERSION=1.0.4 RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION) RPM_ARCH = $(shell uname -i) # root dir for RPM built and temp files diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c index 2168e514..d117d1d9 100644 --- a/ldap/servers/slapd/back-ldbm/dblayer.c +++ b/ldap/servers/slapd/back-ldbm/dblayer.c @@ -683,7 +683,6 @@ static void dblayer_init_dbenv(DB_ENV *pEnv, dblayer_private *priv) #endif #ifdef LINUX #include <linux/kernel.h> -#include <linux/sys.h> #include <sys/sysinfo.h> /* undocumented (?) */ #include <sys/resource.h> #endif diff --git a/ldap/systools/idsktune.c b/ldap/systools/idsktune.c index 5018ad26..8d90160f 100644 --- a/ldap/systools/idsktune.c +++ b/ldap/systools/idsktune.c @@ -108,7 +108,6 @@ extern char *optarg; #include <sys/vfs.h> #include <sys/utsname.h> #include <linux/kernel.h> -#include <linux/sys.h> #include <sys/time.h> #include <sys/param.h> #include <mntent.h> |