Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/mozilla-firefox/patches/mozilla-firefox-1.5.0.11-system-nspr.patch

    Contents of /trunk/mozilla-firefox/patches/mozilla-firefox-1.5.0.11-system-nspr.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 1687 byte(s) 
    -import
    1 --- mozilla/security/manager/Makefile.in.orig 2007-02-23 22:51:02.000000000 +0100
    2 +++ mozilla/security/manager/Makefile.in 2007-02-23 22:53:56.000000000 +0100
    3 @@ -117,13 +117,34 @@
    4 FREEBL_64FPU_LIB = libfreebl_64fpu_3$(DLL_SUFFIX)
    5 FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk
    6 endif
    7 +
    8 +ABS_DIST := $(shell cd $(DIST) && pwd)
    9 +ifeq ($(HOST_OS_ARCH),WINNT)
    10 +ifdef CYGDRIVE_MOUNT
    11 +ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g')
    12 +endif
    13 +endif
    14 +NSPR_INCLUDE_DIR = $(firstword $(filter -I%,$(NSPR_CFLAGS)))
    15 +ifneq (,$(strip $(NSPR_INCLUDE_DIR)))
    16 +NSPR_INCLUDE_DIR := $(subst -I,,$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_INCLUDE_DIR)))
    17 +else
    18 +NSPR_INCLUDE_DIR = $(ABS_DIST)/include/nspr
    19 +endif
    20 +NSPR_LIB_DIR = $(firstword $(filter -L%,$(NSPR_LIBS)))
    21 +ifneq (,$(strip $(NSPR_LIB_DIR)))
    22 +NSPR_LIB_DIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIB_DIR)))
    23 +else
    24 +NSPR_LIB_DIR = $(ABS_DIST)/lib
    25 +endif
    26
    27 # NSS makefiles are not safe for parallel execution.
    28 DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
    29 DEFAULT_GMAKE_FLAGS += CC="$(CC)"
    30 -DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
    31 -DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
    32 -DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
    33 +DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES=-I$(ABS_DIST)/include/dbm
    34 +DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
    35 +DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
    36 +DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=$(NSPR_INCLUDE_DIR)
    37 +DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
    38 DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
    39 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
    40 ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)