Bug#513101: nss: FTBFS

[Sebastian Andrzej Siewior]

tags 513101 + patch
thanks

* Tshepang Lekhonkhobe | 2009-01-26 15:08:59 [+0200]:

>Package: nss
>Version: 3.12.1-1
>Severity: serious
>Justification: no longer builds from source
>
>I get the following:
>
>gcc -o Linux2.6_x86_glibc_PTH_OPT.OBJ/secport.o -c -Wall -pipe -Os -g
>-fPIC -Di386 -DLINUX2_1  -ansi -Wall
>-Werror-implicit-function-declaration -Wno-switch -pipe
>-D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR -DLINUX -Dlinux
>-DXP_UNIX -UDEBUG -DNDEBUG -D_REENTRANT -DNSS_ENABLE_ECC
>-DUSE_UTIL_DIRECTLY -I/usr/include/nspr
>-I/home/wena/temp/nss-3.12.1/mozilla/dist/include
>-I../../../../dist/public/nss -I../../../../dist/private/nss
>-I../../../../dist/include   secport.c
>secport.c: In function 'NSS_PutEnv_Util':
>secport.c:658: error: implicit declaration of function 'putenv'
>make[3]: *** [Linux2.6_x86_glibc_PTH_OPT.OBJ/secport.o] Error 1

Looks like the kbsd patch cleaned up too much :)
Without this patch, the Makefile will overwrite OS_REL_CFLAGS on i386
and strip the -D_XOPEN_SOURCE define away which is required for strdup()

I've tried to merge this into 38_kbsd.dpatch but dpatch is way too
compilicated for me. Here is a patch on top.

---
 mozilla/security/coreconf/Linux.mk |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk
index 1504104..aecf92c 100644
--- a/mozilla/security/coreconf/Linux.mk
+++ b/mozilla/security/coreconf/Linux.mk
@@ -54,14 +54,6 @@ DEFAULT_COMPILER = gcc
 
 CPU_ARCH		= $(OS_TEST)
 
-ifeq ($(KERNEL),linux)
-	OS_REL_CFLAGS	= -D_XOPEN_SOURCE -DLINUX1_2
-	ARCH		= linux
-else
-	OS_REL_CFLAGS	= -D_XOPEN_SOURCE
-	ARCH		= gnu
-endif
-
 ifeq ($(OS_TEST),ppc64)
 	CPU_ARCH	= ppc
 ifeq ($(USE_64),1)
@@ -118,6 +110,13 @@ endif
 endif
 endif
 
+ifeq ($(KERNEL),linux)
+	OS_REL_CFLAGS	= -D_XOPEN_SOURCE -DLINUX1_2
+	ARCH		= linux
+else
+	OS_REL_CFLAGS	= -D_XOPEN_SOURCE
+	ARCH		= gnu
+endif
 
 LIBC_TAG		= _glibc
 
-- 
1.5.6.5