mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
dev-libs/nspr: Sync with Gentoo
It's from Gentoo commit efd94c5b640295212a82f5a921c90388ba180a19.
This commit is contained in:
parent
ae95253051
commit
f3039f0fe5
@ -1,32 +0,0 @@
|
||||
* drop Solaris linker stuff
|
||||
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1988,26 +1988,14 @@
|
||||
CPU_ARCH=`uname -p`
|
||||
MDCPUCFG_H=_solaris.cfg
|
||||
PR_MD_CSRCS=solaris.c
|
||||
- LD=/usr/ccs/bin/ld
|
||||
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
|
||||
RESOLVE_LINK_SYMBOLS=1
|
||||
- case "${OS_RELEASE}" in
|
||||
- 5.8|5.9)
|
||||
- ;;
|
||||
- *)
|
||||
- # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
|
||||
- USE_B_DIRECT=1
|
||||
- ;;
|
||||
- esac
|
||||
if test -n "$GNU_CC"; then
|
||||
DSO_CFLAGS=-fPIC
|
||||
if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
|
||||
GCC_USE_GNU_LD=1
|
||||
fi
|
||||
- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore'
|
||||
- if test -n "$USE_B_DIRECT"; then
|
||||
- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
|
||||
- fi
|
||||
+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
|
||||
else
|
||||
DSO_CFLAGS=-KPIC
|
||||
DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
|
||||
@ -1,26 +0,0 @@
|
||||
--- a/pr/src/misc/prtime.c
|
||||
+++ b/pr/src/misc/prtime.c
|
||||
@@ -1621,7 +1621,7 @@
|
||||
case TT_EET: zone_offset = 2 * 60; break;
|
||||
case TT_JST: zone_offset = 9 * 60; break;
|
||||
default:
|
||||
- PR_ASSERT (0);
|
||||
+ return PR_FAILURE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1677,11 +1677,12 @@
|
||||
struct tm localTime;
|
||||
time_t secs;
|
||||
|
||||
- PR_ASSERT(result->tm_month > -1 &&
|
||||
+ if (!(result->tm_month > -1 &&
|
||||
result->tm_mday > 0 &&
|
||||
result->tm_hour > -1 &&
|
||||
result->tm_min > -1 &&
|
||||
- result->tm_sec > -1);
|
||||
+ result->tm_sec > -1))
|
||||
+ return PR_FAILURE;
|
||||
|
||||
/*
|
||||
* To obtain time_t from a tm structure representing the local
|
||||
Loading…
x
Reference in New Issue
Block a user