build fixes
This commit is contained in:
Martin Stransky
parent
1b7ab3e92c
commit
c3d1034c1c
@ -1,7 +1,7 @@
|
|||||||
diff -up thunderbird-7.0/comm-beta/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/config/autoconf.mk.in
|
diff -up thunderbird-16.0/comm-release/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/config/autoconf.mk.in
|
||||||
--- thunderbird-7.0/comm-beta/config/autoconf.mk.in.old 2011-09-05 12:24:29.000000000 +0200
|
--- thunderbird-16.0/comm-release/config/autoconf.mk.in.dir 2012-10-05 23:20:26.000000000 +0200
|
||||||
+++ thunderbird-7.0/comm-beta/config/autoconf.mk.in 2011-09-12 12:21:09.304918326 +0200
|
+++ thunderbird-16.0/comm-release/config/autoconf.mk.in 2012-10-09 12:57:24.290767832 +0200
|
||||||
@@ -65,7 +65,7 @@ datadir = @datadir@
|
@@ -36,7 +36,7 @@ datadir = @datadir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||||
|
|
||||||
@ -10,27 +10,28 @@ diff -up thunderbird-7.0/comm-beta/config/autoconf.mk.in.old thunderbird-7.0/com
|
|||||||
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
|
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
|
||||||
|
|
||||||
MOZDEPTH = $(DEPTH)/mozilla
|
MOZDEPTH = $(DEPTH)/mozilla
|
||||||
diff -up thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in
|
diff -up thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in
|
||||||
--- thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old 2011-09-05 12:38:22.000000000 +0200
|
diff -up thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk
|
||||||
+++ thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in 2011-09-12 12:21:24.192991555 +0200
|
--- thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir 2012-10-05 23:27:15.000000000 +0200
|
||||||
@@ -68,7 +68,7 @@ datadir = @datadir@
|
+++ thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk 2012-10-09 13:01:32.269317094 +0200
|
||||||
mandir = @mandir@
|
@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1
|
||||||
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
|
||||||
|
|
||||||
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||||
+installdir = $(libdir)/$(MOZ_APP_NAME)
|
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||||
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
|
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||||
|
+installdir = $(libdir)/$(MOZ_APP_NAME)
|
||||||
|
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
|
||||||
|
DIST = $(DEPTH)/dist
|
||||||
|
|
||||||
DIST = $(DEPTH)/dist
|
diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in
|
||||||
diff -up thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in
|
diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk
|
||||||
--- thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old 2011-09-05 12:38:30.000000000 +0200
|
--- thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir 2012-10-05 23:27:30.000000000 +0200
|
||||||
+++ thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in 2011-09-12 12:21:37.409056596 +0200
|
+++ thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk 2012-10-09 13:02:00.885495014 +0200
|
||||||
@@ -61,7 +61,7 @@ libdir = @libdir@
|
@@ -1,6 +1,6 @@
|
||||||
datadir = @datadir@
|
INCLUDED_AUTOCONF_MK = 1
|
||||||
mandir = @mandir@
|
|
||||||
|
|
||||||
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||||
+installdir = $(libdir)/$(MOZ_APP_NAME)
|
+installdir = $(libdir)/$(MOZ_APP_NAME)
|
||||||
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
|
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
|
||||||
|
|
||||||
TOP_DIST = @TOP_DIST@
|
ifneq (,$(filter /%,$(TOP_DIST)))
|
||||||
|
|||||||
@ -74,7 +74,7 @@ Patch104: xulrunner-10.0-gcc47.patch
|
|||||||
Patch200: thunderbird-8.0-enable-addons.patch
|
Patch200: thunderbird-8.0-enable-addons.patch
|
||||||
|
|
||||||
# PPC fixes
|
# PPC fixes
|
||||||
Patch300: xulrunner-852698.patch
|
Patch300: xulrunner-16.0-jemalloc-ppc.patch
|
||||||
Patch301: rhbz-855923.patch
|
Patch301: rhbz-855923.patch
|
||||||
|
|
||||||
%if %{official_branding}
|
%if %{official_branding}
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
Index: comm-release/mozilla/memory/jemalloc/jemalloc.c
|
Index: xulrunner-11.0/mozilla-release/memory/jemalloc/jemalloc.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- comm-release.orig/mozilla/memory/jemalloc/jemalloc.c
|
--- a/mozilla/memory/mozjemalloc/jemalloc.c
|
||||||
+++ comm-release/mozilla/memory/jemalloc/jemalloc.c
|
+++ b/mozilla/memory/mozjemalloc/jemalloc.c
|
||||||
@@ -1091,7 +1091,9 @@ static unsigned ncpus;
|
@@ -1089,7 +1089,9 @@ static unsigned ncpus;
|
||||||
* controlling the malloc behavior are defined as compile-time constants
|
* controlling the malloc behavior are defined as compile-time constants
|
||||||
* for best performance and cannot be altered at runtime.
|
* for best performance and cannot be altered at runtime.
|
||||||
*/
|
*/
|
||||||
Loading…
Reference in New Issue
Block a user