source: trunk/dports/devel/ice-python25/files/patch-py.config.Make.rules.Darwin.diff @ 49203

Last change on this file since 49203 was 49203, checked in by blair@…, 11 years ago

New upstream 3.3.1 release.

Remove the protobuf-patch-0.1.0.gz patch is this is now in 3.3.1.

Prevent name conflicts between libICE.* from xorg-libice and libIce.*
from this port by renaming libIce.* to libZeroCIce.*.

Rename patch-config.TestUtil.py.diff to patch-scripts.TestUtil.py.diff
to reflect the file's new location.

File size: 1.1 KB
  • py/config/Make.rules.Darwin

    diff -ru ../Ice-3.3.1.orig/py/config/Make.rules.Darwin ./py/config/Make.rules.Darwin
    old new  
    1818    ifeq ($(shell test ! -f $(PYTHON_HOME)/Python && echo 0),0)
    1919        $(error Unable to find Python framework See config/Make.rules.Darwin)
    2020    endif
    21     PYTHON_LIBS         = -F$(patsubst %/Python.framework/Versions/,%,$(dir $(PYTHON_HOME))) -framework Python
     21    PYTHON_LIBS         = $(PYTHON_HOME)/Python
    2222else
    2323    PYTHON_HOME         = /System/Library/Frameworks/Python.framework/Versions/Current
    2424    PYTHON_LIBS         = -framework Python
     
    2626
    2727PYTHON_INCLUDE_DIR      = $(PYTHON_HOME)/include/$(PYTHON_VERSION)
    2828
    29 CXX                     = c++
     29CXX                    ?= c++
    3030
    3131CXXFLAGS                = -ftemplate-depth-128 -Wall -D_REENTRANT
    3232
     
    4646mkshlib                 = $(CXX) -bundle $(shlibldflags) -o $(1) $(3) $(4)
    4747
    4848BASELIBS                = -lIceUtil -lpthread
    49 LIBS                    = -lIce $(BASELIBS)
     49LIBS                    = -lZeroCIce $(BASELIBS)
    5050
    51 PLATFORM_HAS_READLINE   := no
     51PLATFORM_HAS_READLINE   := yes
Note: See TracBrowser for help on using the repository browser.