Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/spidermonkey-07-makefile.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3902 66caadcb64c4
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3902
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     1
 
--- a/js/src/Makefile.in-orig	2011-10-20 05:34:41.145427306 -0500
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     2
 
+++ a/js/src/Makefile.in	2011-10-20 05:51:42.234360280 -0500
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     3
 
@@ -861,17 +861,17 @@ install:: $(SCRIPTS)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     4
 
 ifeq (,$(HOST_BIN_SUFFIX))
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     5
 
 ifeq (.dylib,$(DLL_SUFFIX))
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     6
 
 # Mac OS X
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     7
 
-SHLIB_ANY_VER   := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     8
 
-SHLIB_ABI_VER   := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY:$(DLL_SUFFIX)=.$(SRCREL_ABI_VERSION)$(DLL_SUFFIX))
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     9
 
-SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY:$(DLL_SUFFIX)=.$(SRCREL_VERSION)$(DLL_SUFFIX))
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    10
 
+SHLIB_ANY_VER   := $(SHARED_LIBRARY)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    11
 
+SHLIB_ABI_VER   := $(SHARED_LIBRARY:$(DLL_SUFFIX)=.$(SRCREL_ABI_VERSION)$(DLL_SUFFIX))
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    12
 
+SHLIB_EXACT_VER := $(SHARED_LIBRARY:$(DLL_SUFFIX)=.$(SRCREL_VERSION)$(DLL_SUFFIX))
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    13
 
 $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -install_name $(SHLIB_ABI_VER)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    14
 
 $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -current_version $(SRCREL_VERSION)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    15
 
 $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -compatibility_version $(SRCREL_ABI_VERSION)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    16
 
 else
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    17
 
 # Generic Unix / Linux
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    18
 
-SHLIB_ANY_VER   := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    19
 
-SHLIB_ABI_VER   := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    20
 
-SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    21
 
+SHLIB_ANY_VER   := $(SHARED_LIBRARY)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    22
 
+SHLIB_ABI_VER   := $(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    23
 
+SHLIB_EXACT_VER := $(SHARED_LIBRARY).$(SRCREL_VERSION)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    24
 
 $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    25
 
 endif
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    26
 
 endif
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    27
 
@@ -887,10 +887,10 @@ ifeq (,$(HOST_BIN_SUFFIX))
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    28
 
 endif
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    29
 
 	$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    30
 
 ifeq (,$(HOST_BIN_SUFFIX))
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    31
 
-	mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    32
 
-	@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    33
 
-	ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    34
 
-	ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    35
 
+	cd $(DESTDIR)$(libdir); mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    36
 
+	@[ ! -h $(DESTDIR)$(libdir)/$(SHLIB_ABI_VER) ] || rm -f $(DESTDIR)$(libdir)/$(SHLIB_ABI_VER)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    37
 
+	cd $(DESTDIR)$(libdir); ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    38
 
+	cd $(DESTDIR)$(libdir); ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    39
 
 endif
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    40
 
 endif
66caadcb64c4 2011-10-22 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    41
 
 ifneq (,$(IMPORT_LIBRARY))
upstream/spec-files-extra