59 lines
2.1 KiB
Plaintext
59 lines
2.1 KiB
Plaintext
|
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/04/07 13:48:18 landry Exp $
|
||
|
|
Don't do the horrible symlink dance
|
||
|
|
--- Makefile.in.orig Thu Mar 31 21:08:36 2011
|
||
|
|
+++ Makefile.in Thu Apr 5 11:56:13 2012
|
||
|
|
@@ -95,7 +95,7 @@ MODULE_OPTIMIZE_FLAGS = -O2 -ip
|
||
|
|
endif
|
||
|
|
else # not INTEL_CXX
|
||
|
|
|
||
|
|
-MODULE_OPTIMIZE_FLAGS = -O3 -fstrict-aliasing
|
||
|
|
+MODULE_OPTIMIZE_FLAGS = -fstrict-aliasing
|
||
|
|
|
||
|
|
# We normally want -fomit-frame-pointer, but we want an explicit
|
||
|
|
# -fno-omit-frame-pointer if we're using a sampling profiler.
|
||
|
|
@@ -382,7 +382,7 @@ CPPSRCS += checks.cc \
|
||
|
|
# END enclude sources for V8 dtoa
|
||
|
|
#############################################
|
||
|
|
|
||
|
|
-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
|
||
|
|
+ifeq (,$(filter-out powerpc sparc sparc64,$(TARGET_CPU)))
|
||
|
|
|
||
|
|
VPATH += $(srcdir)/assembler \
|
||
|
|
$(srcdir)/assembler/wtf \
|
||
|
|
@@ -852,10 +852,11 @@ install:: $(pkg_config_files)
|
||
|
|
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig
|
||
|
|
|
||
|
|
install:: $(INSTALLED_HEADERS)
|
||
|
|
- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)
|
||
|
|
+ $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)-$(MOZILLA_VERSION)
|
||
|
|
|
||
|
|
install:: $(SCRIPTS)
|
||
|
|
- $(SYSINSTALL) $^ $(DESTDIR)$(bindir)
|
||
|
|
+ install js-config $(DESTDIR)$(bindir)/js-config-$(MOZILLA_VERSION)
|
||
|
|
+ install js $(DESTDIR)$(bindir)/js-$(MOZILLA_VERSION)
|
||
|
|
|
||
|
|
ifeq (,$(HOST_BIN_SUFFIX))
|
||
|
|
ifeq (.dylib,$(DLL_SUFFIX))
|
||
|
|
@@ -871,7 +872,7 @@ else
|
||
|
|
SHLIB_ANY_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
|
||
|
|
SHLIB_ABI_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
|
||
|
|
SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
|
||
|
|
-$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
|
||
|
|
+$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(SHARED_LIBRARY)
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
|
||
|
|
@@ -885,12 +886,6 @@ ifeq (,$(HOST_BIN_SUFFIX))
|
||
|
|
@[ ! -h $(SHLIB_ANY_VER) ] || rm -f $(SHLIB_ANY_VER)
|
||
|
|
endif
|
||
|
|
$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
|
||
|
|
-ifeq (,$(HOST_BIN_SUFFIX))
|
||
|
|
- mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
|
||
|
|
- @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
|
||
|
|
- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
|
||
|
|
- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
|
||
|
|
-endif
|
||
|
|
endif
|
||
|
|
ifneq (,$(IMPORT_LIBRARY))
|
||
|
|
$(SYSINSTALL) $(IMPORT_LIBRARY) $(DESTDIR)$(libdir)
|