Attachment #341184 for bug #460632

Lines 4-9 Link Here

(-)icu.orig/source/config/mh-darwin (-1 / +8 lines)
4	## Copyright (c) 1999-2011 International Business Machines Corporation and	4	## Copyright (c) 1999-2011 International Business Machines Corporation and
5	## others. All Rights Reserved.	5	## others. All Rights Reserved.
6		6
		7
		8	SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
		9	FINAL_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION).$(SO)
		10	MIDDLE_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION_MAJOR).$(SO)
		11
		12	IS_DARWIN = yes
		13
7	## Flags for position independent code	14	## Flags for position independent code
8	SHAREDLIBCFLAGS = -dynamic	15	SHAREDLIBCFLAGS = -dynamic
9	SHAREDLIBCXXFLAGS = -dynamic	16	SHAREDLIBCXXFLAGS = -dynamic
Lines 28-34 Link Here
28	ifeq ($(ENABLE_RPATH),YES)	35	ifeq ($(ENABLE_RPATH),YES)
29	LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))	36	LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
30	else	37	else
31	LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))	38	LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
32	endif	39	endif
33		40
34	## Compiler switch to embed a runtime search path	41	## Compiler switch to embed a runtime search path

Lines 32-38 Link Here

(-)icu.orig/source/stubdata/Makefile.in (+4 lines)
32		32
33		33
34	ifneq ($(ENABLE_SHARED),)	34	ifneq ($(ENABLE_SHARED),)
		35	ifeq ($(IS_DARWIN),)
35	SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)	36	SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
		37	else
		38	SO_TARGET = $(LIBDIR)/$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
		39	endif
36	ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT)	40	ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT)
37	endif	41	endif
38		42

Lines 31-37 Link Here

(-)icu.orig/source/tools/ctestfw/Makefile.in (+4 lines)
31	endif	31	endif
32		32
33	ifneq ($(ENABLE_SHARED),)	33	ifneq ($(ENABLE_SHARED),)
		34	ifeq ($(IS_DARWIN),)
34	SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)	35	SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
		36	else
		37	SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
		38	endif
35	ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)	39	ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
36	endif	40	endif
37		41

Return to bug 460632