patches/patch-ak

   1 $NetBSD$
   2
   3 --- xpcom/stub/Makefile.in.orig 2009-02-04 09:50:48.000000000 +0900
   4 +++ xpcom/stub/Makefile.in
   5 @@ -107,7 +107,7 @@ else
   6  DEPENDENT_LIBS_LIST += $(LIB_PREFIX)mozjs$(DLL_SUFFIX)
   7  endif
   8
   9 -ifeq (Darwin,$(OS_ARCH))
  10 +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
  11  EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL
  12  DEPENDENT_LIBS_LIST += XUL
  13  else
  14 @@ -129,6 +129,13 @@ endif
  15
  16  EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS) $(NSPR_LIBS)
  17
  18 +ifeq (Darwin,$(OS_ARCH))
  19 +_libs_to_fix = \
  20 +       -lmozjs \
  21 +       $(filter -l%, $(NSS_LIBS))
  22 +EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(_libs_to_fix)), -dylib_file $(libdir)/$(MOZILLA_PKG_NAME)/$(library):$(DIST)/bin/$(library))
  23 +endif
  24 +
  25  include $(topsrcdir)/config/rules.mk
  26
  27  libs:: $(FINAL_TARGET)/dependentlibs.list