浏览代码

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

Rich Megginson 19 年之前
父节点
当前提交
6b0713023b
共有 3 个文件被更改,包括 3 次插入5 次删除
  1. 3 3
      ldap/cm/Makefile
  2. 0 1
      ldap/servers/slapd/back-ldbm/dblayer.c
  3. 0 1
      ldap/systools/idsktune.c

+ 3 - 3
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

+ 0 - 1
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

+ 0 - 1
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>