Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
Education
nvu
system-nspr.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File system-nspr.patch of Package nvu
Index: directory/c-sdk/configure.in ================================================================================ --- security/coreconf/location.mk +++ security/coreconf/location.mk @@ -57,6 +57,8 @@ DIST = $(SOURCE_PREFIX)/$(PLATFORM) +NSPR_LIBDIR = $(DIST)/lib + ifdef BUILD_DEBUG_GC DEFINES += -DDEBUG_GC endif --- security/manager/Makefile.in +++ security/manager/Makefile.in @@ -60,11 +60,22 @@ endif endif +ABS_DIST := $(shell cd $(DIST) && pwd) +ifeq ($(OS_ARCH),WINNT) +ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g') +endif +NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS))) +ifneq (,$(strip $(NSPR_LIBDIR))) +NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR))) +else +NSPR_LIBDIR = $(ABS_DIST)/lib +endif # NSS makefiles are not safe for parallel execution. DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 -DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm" -DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist -DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist +DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)" +DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) +DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) +DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR) DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) --- security/nss/lib/ckfw/builtins/Makefile +++ security/nss/lib/ckfw/builtins/Makefile @@ -49,23 +49,23 @@ # This is merely an expedient hack and not the right solution. ifdef NS_USE_GCC EXTRA_LIBS += \ - -L$(DIST)/lib \ + -L$(NSPR_LIBDIR) \ -lplc4 \ -lplds4 \ -lnspr4 \ $(NULL) else EXTRA_LIBS += \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \ + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \ $(NULL) endif else EXTRA_LIBS += \ - $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ + $(NSPR_LIBDIR)/nspr/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ + $(NSPR_LIBDIR)/nspr/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ $(NULL) endif --- security/nss/lib/fortcrypt/swfort/pkcs11/Makefile +++ security/nss/lib/fortcrypt/swfort/pkcs11/Makefile @@ -59,7 +59,7 @@ $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ $(CRYPTO_LIB) \ $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ - -L$(DIST)/lib \ + -L$(NSPR_LIBDIR) \ -lplc4 \ -lplds4 \ -lnspr4 \ @@ -72,8 +72,8 @@ $(DIST)/lib/softokn.lib \ $(CRYPTO_LIB) \ $(DIST)/lib/secutil.lib \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \ + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \ wsock32.lib \ winmm.lib \ $(NULL) @@ -94,8 +94,8 @@ $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ $(CRYPTO_LIB) \ $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ + $(NSPR_LIBDIR)/nspr/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ + $(NSPR_LIBDIR)/nspr/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ $(NULL) endif
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor