Package: nss
Version: 2:3.21-1
Tags: patch

nss fails to build due to a double definition of BYTE_ORDER.
The attached patch fixes it.
Can you please apply it for next upload ?
Thanks,
Helge



This is the bug:
gcc -o OBJS/db.o -c -g -O2 -Wformat -Werror=format-security -Wall -pipe 
-D_FORTIFY_SOURCE=2 -fPIC -DLINUX2_1  -Wall -Werror -pipe -ffunction-sections 
-fdata-sections -DHAVE_STRERROR -DLINUX -Dlinux -DXP_UNIX -UDEBUG -DNDEBUG 
-D_REENTRANT -DUSE_UTIL_DIRECTLY -DNO_NSPR_10_SUPPORT 
-DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES -DSTDC_HEADERS -DHAVE_STRERROR 
-DHAVE_SNPRINTF -DMEMMOVE -D__DBINTERFACE_PRIVATE -I/usr/include/nspr 
-I/<<PKGBUILDDIR>>/dist/include -I/<<PKGBUILDDIR>>/dist/public/dbm 
-I/<<PKGBUILDDIR>>/dist/private/dbm  db.c
In file included from db.c:50:0:
/<<PKGBUILDDIR>>/dist/public/dbm/mcom_db.h:114:0: error: "BYTE_ORDER" redefined 
[-Werror]
 #define BYTE_ORDER BIG_ENDIAN
 ^
In file included from /usr/include/hppa-linux-gnu/sys/types.h:216:0,
                 from db.c:42:
/usr/include/endian.h:48:0: note: this is the location of the previous 
definition
 # define BYTE_ORDER __BYTE_ORDER
 ^
In file included from db.c:50:0:
/<<PKGBUILDDIR>>/dist/public/dbm/mcom_db.h:115:0: error: "BIG_ENDIAN" redefined 
[-Werror]
 #define BIG_ENDIAN      4321
 ^
In file included from /usr/include/hppa-linux-gnu/sys/types.h:216:0,
                 from db.c:42:
/usr/include/endian.h:46:0: note: this is the location of the previous 
definition
 # define BIG_ENDIAN __BIG_ENDIAN
 ^
diff -up ./nss/lib/dbm/include/mcom_db.h.org ./nss/lib/dbm/include/mcom_db.h
--- ./nss/lib/dbm/include/mcom_db.h.org	2015-12-25 20:53:01.852000000 +0100
+++ ./nss/lib/dbm/include/mcom_db.h	2015-12-25 20:53:17.368000000 +0100
@@ -110,7 +110,7 @@ typedef PRUint32 uint32;
 #endif /* !BYTE_ORDER */
 #endif /* __sun */
 
-#if defined(__hpux) || defined(__hppa)
+#if defined(__hpux)
 #define BYTE_ORDER BIG_ENDIAN
 #define BIG_ENDIAN      4321
 #define LITTLE_ENDIAN   1234            /* LSB first: i386, vax, all NT risc */

Reply via email to