[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2131: fix multiple define of O_RSYNC (in notes from bug 3834)
Mats Wichmann
mats at linuxfoundation.org
Wed Aug 14 22:37:39 UTC 2013
------------------------------------------------------------
revno: 2131
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2013-08-14 16:37:39 -0600
message:
fix multiple define of O_RSYNC (in notes from bug 3834)
modified:
headers/All/5.0/fcntl.h.defs
headers/fcntl.h
package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/fcntl.h.defs'
--- a/headers/All/5.0/fcntl.h.defs 2013-03-11 21:23:29 +0000
+++ b/headers/All/5.0/fcntl.h.defs 2013-08-14 22:37:39 +0000
@@ -7,7 +7,6 @@
#define O_CREAT 0100
#define O_TRUNC 01000
#define O_DSYNC 010000
-#define O_RSYNC 010000
#define O_RDWR 02
#define O_EXCL 0200
#define O_APPEND 02000
=== modified file 'headers/fcntl.h'
--- a/headers/fcntl.h 2013-03-11 21:23:29 +0000
+++ b/headers/fcntl.h 2013-08-14 22:37:39 +0000
@@ -99,49 +99,52 @@
#if __LSB_VERSION__ >= 40
#define O_DSYNC 010000
+#if defined __powerpc__ && !defined __powerpc64__
+#define O_NOFOLLOW 0100000
+#endif
+#if defined __powerpc64__
+#define O_NOFOLLOW 0100000
+#endif
+#if defined __i386__
+#define O_DIRECTORY 0200000
+#endif
+#if defined __ia64__
+#define O_DIRECTORY 0200000
+#endif
+#if defined __s390__ && !defined __s390x__
+#define O_DIRECTORY 0200000
+#endif
+#if defined __x86_64__
+#define O_DIRECTORY 0200000
+#endif
+#if defined __s390x__
+#define O_DIRECTORY 0200000
+#endif
+#if defined __powerpc__ && !defined __powerpc64__
+#define O_DIRECTORY 040000
+#endif
+#if defined __powerpc64__
+#define O_DIRECTORY 040000
+#endif
+#if defined __i386__
+#define O_NOFOLLOW 0400000
+#endif
+#if defined __ia64__
+#define O_NOFOLLOW 0400000
+#endif
+#if defined __s390__ && !defined __s390x__
+#define O_NOFOLLOW 0400000
+#endif
+#if defined __x86_64__
+#define O_NOFOLLOW 0400000
+#endif
+#if defined __s390x__
+#define O_NOFOLLOW 0400000
+#endif
+#if __LSB_VERSION__ < 50
#define O_RSYNC 010000
-#if defined __powerpc__ && !defined __powerpc64__
-#define O_NOFOLLOW 0100000
-#endif
-#if defined __powerpc64__
-#define O_NOFOLLOW 0100000
-#endif
-#if defined __i386__
-#define O_DIRECTORY 0200000
-#endif
-#if defined __ia64__
-#define O_DIRECTORY 0200000
-#endif
-#if defined __s390__ && !defined __s390x__
-#define O_DIRECTORY 0200000
-#endif
-#if defined __x86_64__
-#define O_DIRECTORY 0200000
-#endif
-#if defined __s390x__
-#define O_DIRECTORY 0200000
-#endif
-#if defined __powerpc__ && !defined __powerpc64__
-#define O_DIRECTORY 040000
-#endif
-#if defined __powerpc64__
-#define O_DIRECTORY 040000
-#endif
-#if defined __i386__
-#define O_NOFOLLOW 0400000
-#endif
-#if defined __ia64__
-#define O_NOFOLLOW 0400000
-#endif
-#if defined __s390__ && !defined __s390x__
-#define O_NOFOLLOW 0400000
-#endif
-#if defined __x86_64__
-#define O_NOFOLLOW 0400000
-#endif
-#if defined __s390x__
-#define O_NOFOLLOW 0400000
-#endif
+#endif /* __LSB_VERSION__ < 5.0 */
+
#endif /* __LSB_VERSION__ >= 4.0 */
#if __LSB_VERSION__ >= 50
=== modified file 'package/Makefile'
--- a/package/Makefile 2013-08-14 15:58:21 +0000
+++ b/package/Makefile 2013-08-14 22:37:39 +0000
@@ -46,7 +46,7 @@
# We define this here instead of directly in the spec file as
# we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=5
+RPM_PACKAGE_RELEASE=6
# Initialize LIB64 to proper value for 64-bit architectures
export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)
More information about the lsb-messages
mailing list