[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
trey
trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:31:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5d05e621d6e06654e894b297a41201e557653b6c
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 25 18:42:32 2003 +0000
JavaScriptCore:
Pass -seg_addr_table_filename <FILENAME> to ld. This makes our frameworks in
SYMROOT actually work for symbol resolution because they will have the correct
prebinding address. It also fixes obscure B&I problems with prebinding
reported by Matt Reda.
Note the reason all this is tricky for our projects is that we have a different
install location for Jaguar and Panther. The purpose of this arg is to declare
at link time our eventual location, which allows the prebinding address to be
found in /AppleInternal/Developer/seg_addr_table. We use a funky back-tick
expression within OTHER_LDFLAGS to get a conditional value depending on the
build train we are in.
This can all go away once we only build on Panther and don't embed the
frameworks inside the Safari.app wrapper.
In addition I fixed the OTHER_LDFLAGS settings in our build styles to be
additive instead of overriding, so we have the args we used for B&I in force
when building outside of B&I.
Reviewed by Maciej.
* JavaScriptCore.pbproj/project.pbxproj:
WebFoundation:
Pass -seg_addr_table_filename <FILENAME> to ld. This makes our frameworks in
SYMROOT actually work for symbol resolution because they will have the correct
prebinding address. It also fixes obscure B&I problems with prebinding
reported by Matt Reda.
Note the reason all this is tricky for our projects is that we have a different
install location for Jaguar and Panther. The purpose of this arg is to declare
at link time our eventual location, which allows the prebinding address to be
found in /AppleInternal/Developer/seg_addr_table. We use a funky back-tick
expression within OTHER_LDFLAGS to get a conditional value depending on the
build train we are in.
This can all go away once we only build on Panther and don't embed the
frameworks inside the Safari.app wrapper.
In addition I fixed the OTHER_LDFLAGS settings in our build styles to be
additive instead of overriding, so we have the args we used for B&I in force
when building outside of B&I.
Reviewed by Maciej.
* WebFoundation.pbproj/project.pbxproj:
WebCore:
Pass -seg_addr_table_filename <FILENAME> to ld. This makes our frameworks in
SYMROOT actually work for symbol resolution because they will have the correct
prebinding address. It also fixes obscure B&I problems with prebinding
reported by Matt Reda.
Note the reason all this is tricky for our projects is that we have a different
install location for Jaguar and Panther. The purpose of this arg is to declare
at link time our eventual location, which allows the prebinding address to be
found in /AppleInternal/Developer/seg_addr_table. We use a funky back-tick
expression within OTHER_LDFLAGS to get a conditional value depending on the
build train we are in.
This can all go away once we only build on Panther and don't embed the
frameworks inside the Safari.app wrapper.
In addition I fixed the OTHER_LDFLAGS settings in our build styles to be
additive instead of overriding, so we have the args we used for B&I in force
when building outside of B&I.
Reviewed by Maciej.
* WebCore.pbproj/project.pbxproj:
WebKit:
Pass -seg_addr_table_filename <FILENAME> to ld. This makes our frameworks in
SYMROOT actually work for symbol resolution because they will have the correct
prebinding address. It also fixes obscure B&I problems with prebinding
reported by Matt Reda.
Note the reason all this is tricky for our projects is that we have a different
install location for Jaguar and Panther. The purpose of this arg is to declare
at link time our eventual location, which allows the prebinding address to be
found in /AppleInternal/Developer/seg_addr_table. We use a funky back-tick
expression within OTHER_LDFLAGS to get a conditional value depending on the
build train we are in.
This can all go away once we only build on Panther and don't embed the
frameworks inside the Safari.app wrapper.
In addition I fixed the OTHER_LDFLAGS settings in our build styles to be
additive instead of overriding, so we have the args we used for B&I in force
when building outside of B&I.
Reviewed by Maciej.
* WebKit.pbproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3916 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 0b7dc3b..4c1f7b6 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,28 @@
+2003-03-24 Trey Matteson <trey at apple.com>
+
+ Pass -seg_addr_table_filename <FILENAME> to ld. This makes our frameworks in
+ SYMROOT actually work for symbol resolution because they will have the correct
+ prebinding address. It also fixes obscure B&I problems with prebinding
+ reported by Matt Reda.
+
+ Note the reason all this is tricky for our projects is that we have a different
+ install location for Jaguar and Panther. The purpose of this arg is to declare
+ at link time our eventual location, which allows the prebinding address to be
+ found in /AppleInternal/Developer/seg_addr_table. We use a funky back-tick
+ expression within OTHER_LDFLAGS to get a conditional value depending on the
+ build train we are in.
+
+ This can all go away once we only build on Panther and don't embed the
+ frameworks inside the Safari.app wrapper.
+
+ In addition I fixed the OTHER_LDFLAGS settings in our build styles to be
+ additive instead of overriding, so we have the args we used for B&I in force
+ when building outside of B&I.
+
+ Reviewed by Maciej.
+
+ * JavaScriptCore.pbproj/project.pbxproj:
+
=== Safari-68 ===
2003-03-16 Trey Matteson <trey at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 0b7dc3b..4c1f7b6 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,28 @@
+2003-03-24 Trey Matteson <trey at apple.com>
+
+ Pass -seg_addr_table_filename <FILENAME> to ld. This makes our frameworks in
+ SYMROOT actually work for symbol resolution because they will have the correct
+ prebinding address. It also fixes obscure B&I problems with prebinding
+ reported by Matt Reda.
+
+ Note the reason all this is tricky for our projects is that we have a different
+ install location for Jaguar and Panther. The purpose of this arg is to declare
+ at link time our eventual location, which allows the prebinding address to be
+ found in /AppleInternal/Developer/seg_addr_table. We use a funky back-tick
+ expression within OTHER_LDFLAGS to get a conditional value depending on the
+ build train we are in.
+
+ This can all go away once we only build on Panther and don't embed the
+ frameworks inside the Safari.app wrapper.
+
+ In addition I fixed the OTHER_LDFLAGS settings in our build styles to be
+ additive instead of overriding, so we have the args we used for B&I in force
+ when building outside of B&I.
+
+ Reviewed by Maciej.
+
+ * JavaScriptCore.pbproj/project.pbxproj:
+
=== Safari-68 ===
2003-03-16 Trey Matteson <trey at apple.com>
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 4625d87..0782ac6 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -12,7 +12,7 @@
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
OPTIMIZATION_CFLAGS = "-O0";
- OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Development;
@@ -23,7 +23,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUGGING_SYMBOLS = NO;
- OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Deployment;
@@ -127,7 +127,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.2;
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
- OTHER_LDFLAGS = "";
+ OTHER_LDFLAGS = "-seg_addr_table_filename \"`if [ \"x${RC_RELEASE}\" = \"xPanther\" ]; then echo \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; else echo \"/Applications/Safari.app/Contents/Frameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; fi`\"";
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = JavaScriptCorePrefix.h;
PRODUCT_NAME = JavaScriptCore;
@@ -814,7 +814,7 @@
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
OPTIMIZATION_CFLAGS = "-O";
- OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Mixed;
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e428e9e..c3c2126 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,28 @@
+2003-03-24 Trey Matteson <trey at apple.com>
+
+ Pass -seg_addr_table_filename <FILENAME> to ld. This makes our frameworks in
+ SYMROOT actually work for symbol resolution because they will have the correct
+ prebinding address. It also fixes obscure B&I problems with prebinding
+ reported by Matt Reda.
+
+ Note the reason all this is tricky for our projects is that we have a different
+ install location for Jaguar and Panther. The purpose of this arg is to declare
+ at link time our eventual location, which allows the prebinding address to be
+ found in /AppleInternal/Developer/seg_addr_table. We use a funky back-tick
+ expression within OTHER_LDFLAGS to get a conditional value depending on the
+ build train we are in.
+
+ This can all go away once we only build on Panther and don't embed the
+ frameworks inside the Safari.app wrapper.
+
+ In addition I fixed the OTHER_LDFLAGS settings in our build styles to be
+ additive instead of overriding, so we have the args we used for B&I in force
+ when building outside of B&I.
+
+ Reviewed by Maciej.
+
+ * WebCore.pbproj/project.pbxproj:
+
2003-03-24 David Hyatt <hyatt at apple.com>
Clean up isInlineFlow. Add a couple of new methods that I'll
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e428e9e..c3c2126 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,28 @@
+2003-03-24 Trey Matteson <trey at apple.com>
+
+ Pass -seg_addr_table_filename <FILENAME> to ld. This makes our frameworks in
+ SYMROOT actually work for symbol resolution because they will have the correct
+ prebinding address. It also fixes obscure B&I problems with prebinding
+ reported by Matt Reda.
+
+ Note the reason all this is tricky for our projects is that we have a different
+ install location for Jaguar and Panther. The purpose of this arg is to declare
+ at link time our eventual location, which allows the prebinding address to be
+ found in /AppleInternal/Developer/seg_addr_table. We use a funky back-tick
+ expression within OTHER_LDFLAGS to get a conditional value depending on the
+ build train we are in.
+
+ This can all go away once we only build on Panther and don't embed the
+ frameworks inside the Safari.app wrapper.
+
+ In addition I fixed the OTHER_LDFLAGS settings in our build styles to be
+ additive instead of overriding, so we have the args we used for B&I in force
+ when building outside of B&I.
+
+ Reviewed by Maciej.
+
+ * WebCore.pbproj/project.pbxproj:
+
2003-03-24 David Hyatt <hyatt at apple.com>
Clean up isInlineFlow. Add a couple of new methods that I'll
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 6ae0629..f6127ef 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -13,7 +13,7 @@
DEBUG_CFLAGS = "";
EXPORTED_SYMBOLS_FILE = "WebCore-combined.exp";
OPTIMIZATION_CFLAGS = "-O0";
- OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Development;
@@ -24,7 +24,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUGGING_SYMBOLS = NO;
- OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Deployment;
@@ -136,7 +136,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.2;
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
- OTHER_LDFLAGS = "-no-c++filt";
+ OTHER_LDFLAGS = "-no-c++filt -seg_addr_table_filename \"`if [ \"x${RC_RELEASE}\" = \"xPanther\" ]; then echo \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; else echo \"/Applications/Safari.app/Contents/Frameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; fi`\"";
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = WebCorePrefix.h;
PRODUCT_NAME = WebCore;
@@ -8152,7 +8152,7 @@
DEBUG_CFLAGS = "";
EXPORTED_SYMBOLS_FILE = "WebCore-combined.exp";
OPTIMIZATION_CFLAGS = "-O";
- OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Mixed;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a50f18f..2d6f0dc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,28 @@
+2003-03-24 Trey Matteson <trey at apple.com>
+
+ Pass -seg_addr_table_filename <FILENAME> to ld. This makes our frameworks in
+ SYMROOT actually work for symbol resolution because they will have the correct
+ prebinding address. It also fixes obscure B&I problems with prebinding
+ reported by Matt Reda.
+
+ Note the reason all this is tricky for our projects is that we have a different
+ install location for Jaguar and Panther. The purpose of this arg is to declare
+ at link time our eventual location, which allows the prebinding address to be
+ found in /AppleInternal/Developer/seg_addr_table. We use a funky back-tick
+ expression within OTHER_LDFLAGS to get a conditional value depending on the
+ build train we are in.
+
+ This can all go away once we only build on Panther and don't embed the
+ frameworks inside the Safari.app wrapper.
+
+ In addition I fixed the OTHER_LDFLAGS settings in our build styles to be
+ additive instead of overriding, so we have the args we used for B&I in force
+ when building outside of B&I.
+
+ Reviewed by Maciej.
+
+ * WebKit.pbproj/project.pbxproj:
+
2003-03-25 Ken Kocienda <kocienda at apple.com>
Reviewed by Darin
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 4521207..1f80b6e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -12,7 +12,7 @@
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
OPTIMIZATION_CFLAGS = "-O0";
- OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Development;
@@ -23,7 +23,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUGGING_SYMBOLS = NO;
- OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Deployment;
@@ -144,7 +144,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.2;
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DFRAMEWORK_NAME=WebKit";
- OTHER_LDFLAGS = "-no-c++filt";
+ OTHER_LDFLAGS = "-no-c++filt -seg_addr_table_filename \"`if [ \"x${RC_RELEASE}\" = \"xPanther\" ]; then echo \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; else echo \"/Applications/Safari.app/Contents/Frameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"; fi`\"";
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = WebKitPrefix.h;
PRODUCT_NAME = WebKit;
@@ -3047,7 +3047,7 @@
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
OPTIMIZATION_CFLAGS = "-O";
- OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+ OTHER_LDFLAGS = "\U0001-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
name = Mixed;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list