git.squeep.com Git - portage-squeep/blob - dev-libs/icu/files/icu-64.2-darwin.patch

   1 same as 4.7, but retargetted to apply with eapply
   2
   3 forward-ported from v58.2 to v64.2
   4
   5 --- a/config/mh-darwin
   6 +++ b/config/mh-darwin
   7 @@ -6,6 +6,12 @@
   8  ## Copyright (c) 1999-2012 International Business Machines Corporation and
   9  ## others. All Rights Reserved.
  10
  11 +SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
  12 +FINAL_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION).$(SO)
  13 +MIDDLE_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION_MAJOR).$(SO)
  14 +
  15 +IS_DARWIN = yes
  16 +
  17  ## Flags for position independent code
  18  SHAREDLIBCFLAGS = -dynamic
  19  SHAREDLIBCXXFLAGS = -dynamic
  20 @@ -33,7 +39,7 @@
  21  ifeq ($(ENABLE_RPATH),YES)
  22  LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
  23  else
  24 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
  25 +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
  26  endif
  27
  28  ## Compiler switch to embed a runtime search path
  29 --- a/stubdata/Makefile.in
  30 +++ b/stubdata/Makefile.in
  31 @@ -34,7 +34,11 @@
  32
  33
  34  ifneq ($(ENABLE_SHARED),)
  35 +ifeq ($(IS_DARWIN),)
  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
  40  ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT)
  41  endif
  42
  43 --- a/tools/ctestfw/Makefile.in
  44 +++ b/tools/ctestfw/Makefile.in
  45 @@ -33,7 +33,11 @@
  46  endif
  47
  48  ifneq ($(ENABLE_SHARED),)
  49 +ifeq ($(IS_DARWIN),)
  50  SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
  51 +else
  52 +SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
  53 +endif
  54  ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
  55  endif
  56