Ticket #25798: poco_1.3.6p2_update.patch

File poco_1.3.6p2_update.patch, 10.6 KB (added by nimahoda@…, 14 years ago)

  • poco/Portfile 

    diff -N -u -r /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/poco/Portfile poco/Portfile
    old new  
    44PortSystem      1.0
    55
    66name            poco
    7 version         1.3.5
     7version         1.3.6p2
    88categories      devel
    99maintainers     nox openmaintainer
    1010platforms       darwin
    … …  
    2222set docdistname ${name}-[strsed ${version} {s/[a-z].*$//}]-doc
    2323
    2424checksums       [suffix ${distname}] \
    25                     md5     b36fc66e39560dd985d4ae4bc8011be8 \
    26                     sha1    e7901adbd29b8c194b67ee476b0ace27772e5c4e \
    27                     rmd160  5e40706ce786127517649c3693d39777ad620eb4 \
     25                    md5     8f1a6c3511764167d39f1950da3fcb37 \
     26                    sha1    46c66620f7685e9ed9f7caffc8ff3a09454c06de \
     27                    rmd160  effaff38aebca34af7dbbd3aae0798af95268790 \
    2828                ${docdistname}.tar.gz \
    29                     md5     357fbbb4f31921ebe7dc49a1b6b5742c \
    30                     sha1    0d0af652752e7cb584900313afc1e2e57bea68f9 \
    31                     rmd160  a43b7a77ee3a9eb6e7736786f7808ef5fd22202c
    32 
    33 patchfiles      patch-rules-deps.diff
     29                    md5     a6abb9a02b0a7406194853d422d5fc28 \
     30                    sha1    2167220ad0c354c3ae8a9ea1be4a7d91d73976a3 \
     31                    rmd160  78b82bd8dd19dd4bb599543d860a1aae8585a64f
    3432
    3533set config      Darwin
    3634set omit        {NetSSL_OpenSSL Data/ODBC Data/MySQL Crypto}
    … …  
    115113}
    116114
    117115variant odbc description {Build ODBC backend for Data library} {
    118     patchfiles-append       patch-Data-ODBC-Makefile.diff
    119116    depends_lib-append      lib:libiodbc:unixODBC
    120117    set omit [ldelete ${omit} Data/ODBC]
    121118}
    122119
    123120variant mysql description {Build MySQL backend for Data library} {
    124     patchfiles-append       patch-Data-MySQL-Makefile.diff
    125 
    126121    depends_lib-append      path:bin/mysql_config5:mysql5
    127122
    128123    post-configure {

  • poco/files/patch-Data-MySQL-Makefile.diff 

    diff -N -u -r /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/poco/files/patch-Data-MySQL-Makefile.diff poco/files/patch-Data-MySQL-Makefile.diff
    old new  
    1 diff -ur Data.orig/MySQL/Makefile Data/MySQL/Makefile
    2 --- Data/MySQL/Makefile 2009-04-19 17:09:05.000000000 +0200
    3 +++ Data/MySQL/Makefile 2009-04-19 17:10:37.000000000 +0200
    4 @@ -8,8 +8,7 @@
    5  
    6  include $(POCO_BASE)/build/rules/global
    7  
    8 -SYSLIBS += -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient
    9 -INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include
    10 +SYSLIBS += -lmysqlclient
    11  SYSFLAGS += -DTHREADSAFE -DNO_TCL
    12  
    13  objects = Binder Extractor SessionImpl Connector \

  • poco/files/patch-Data-ODBC-Makefile.diff 

    diff -N -u -r /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/poco/files/patch-Data-ODBC-Makefile.diff poco/files/patch-Data-ODBC-Makefile.diff
    old new  
    1 --- Data/ODBC/Makefile.orig     2009-04-25 13:31:41.000000000 +0200
    2 +++ Data/ODBC/Makefile  2009-04-25 14:24:42.000000000 +0200
    3 @@ -8,45 +8,8 @@
    4  
    5  include $(POCO_BASE)/build/rules/global
    6  
    7 -# adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
    8 -ODBCLIBDIR = /usr/lib
    9 -
    10 -INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
    11 -SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib
    12 -
    13 -ifeq ($(POCO_CONFIG),MinGW)
    14 -# Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
    15 -else
    16 -ifeq ($(POCO_CONFIG),CYGWIN)
    17 -# -DODBCVER=0x0300: SQLHandle declaration issue
    18 -# -DNOMINMAX      : MIN/MAX macros defined in windows conflict with libstdc++
    19 -CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
    20 -# CYGWIN platform has its own ODBC library in /lib/w32api
    21 -SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
    22 -else
    23 -ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
    24 -SYSLIBS += -lodbc -lodbcinst
    25 -COMMONFLAGS += -DPOCO_UNIXODBC
    26 -else
    27 -ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
    28 -SYSLIBS += -lodbc -lodbcinst
    29 -COMMONFLAGS += -DPOCO_UNIXODBC
    30 -else
    31 -ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
    32 -SYSLIBS += -liodbc -liodbcinst
    33 -COMMONFLAGS += -DPOCO_IODBC
    34 -else
    35 -ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
    36  SYSLIBS += -liodbc -liodbcinst
    37  COMMONFLAGS += -DPOCO_IODBC
    38 -else
    39 -$(error No ODBC library found. Please install unixODBC or iODBC and try again)
    40 -endif
    41 -endif
    42 -endif
    43 -endif
    44 -endif
    45 -endif
    46  
    47  objects = Binder ConnectionHandle Connector DataTypes EnvironmentHandle \
    48         Extractor ODBCColumn ODBCException ODBCStatementImpl \

  • poco/files/patch-rules-deps.diff 

    diff -N -u -r /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/poco/files/patch-rules-deps.diff poco/files/patch-rules-deps.diff
    old new  
    1 diff -ur build.orig/rules/compile build/rules/compile
    2 --- build.orig/rules/compile    2008-05-15 12:56:50.000000000 +0200
    3 +++ build/rules/compile 2008-05-15 12:58:19.000000000 +0200
    4 @@ -32,49 +32,34 @@
    5  #
    6  # Rules for compiling
    7  #     
    8 -$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
    9 +$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp
    10         @echo "** Compiling" $< "(debug)"
    11         $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
    12  
    13 -$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
    14 +$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp
    15         @echo "** Compiling" $< "(release)"
    16         $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
    17  
    18 -$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
    19 +$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c
    20         @echo "** Compiling" $< "(debug)"
    21         $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@
    22  
    23 -$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
    24 +$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c
    25         @echo "** Compiling" $< "(release)"
    26         $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
    27  
    28 -$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
    29 +$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp
    30         @echo "** Compiling" $< "(debug, shared)"
    31         $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
    32  
    33 -$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
    34 +$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp
    35         @echo "** Compiling" $< "(release, shared)"
    36         $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
    37  
    38 -$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
    39 +$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c
    40         @echo "** Compiling" $< "(debug, shared)"
    41         $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
    42  
    43 -$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
    44 +$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c
    45         @echo "** Compiling" $< "(release, shared)"
    46         $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
    47 -
    48 -#
    49 -# Rules for creating dependency information
    50 -#
    51 -$(DEPPATH)/%.d: $(SRCDIR)/%.cpp
    52 -       @echo "** Creating dependency info for" $^
    53 -       $(MKDIR) $(DEPPATH)
    54 -       $(DEP) $(SRCDIR)/$(patsubst %.d,%.cpp,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CXXFLAGS)
    55 -
    56 -$(DEPPATH)/%.d: $(SRCDIR)/%.c
    57 -       @echo "** Creating dependency info for" $^
    58 -       $(MKDIR) $(DEPPATH)
    59 -       $(DEP) $(SRCDIR)/$(patsubst %.d,%.c,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CFLAGS)
    60 -
    61 -depend: $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
    62 diff -ur build.orig/rules/dylib build/rules/dylib
    63 --- build.orig/rules/dylib      2008-05-15 12:56:50.000000000 +0200
    64 +++ build/rules/dylib   2008-05-15 12:58:40.000000000 +0200
    65 @@ -70,8 +70,3 @@
    66         @echo "** Building dynamic library (release)" $@
    67         $(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
    68         $(postbuild)
    69 -
    70 -#
    71 -# Include the automatically generated dependency files
    72 -#
    73 -sinclude $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
    74 diff -ur build.orig/rules/exec build/rules/exec
    75 --- build.orig/rules/exec       2008-05-15 12:56:50.000000000 +0200
    76 +++ build/rules/exec    2008-05-15 12:58:52.000000000 +0200
    77 @@ -57,8 +57,3 @@
    78         $(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
    79         $(STRIPCMD)
    80         $(postbuild)
    81 -
    82 -#
    83 -# Include the automatically generated dependency files
    84 -#
    85 -sinclude $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
    86 diff -ur build.orig/rules/global build/rules/global
    87 --- build.orig/rules/global     2008-05-15 12:56:50.000000000 +0200
    88 +++ build/rules/global  2008-05-15 12:59:10.000000000 +0200
    89 @@ -104,11 +104,9 @@
    90  LIBDIR   = lib/$(OSNAME)/$(OSARCH)
    91  BINDIR   = bin/$(OSNAME)/$(OSARCH)
    92  OBJDIR   = obj/$(OSNAME)/$(OSARCH)
    93 -DEPDIR   = .dep/$(OSNAME)/$(OSARCH)
    94  LIBPATH  = $(POCO_BUILD)/$(LIBDIR)
    95  BINPATH  = $(POCO_BUILD)/$(COMPONENT)/$(BINDIR)
    96  OBJPATH  = $(POCO_BUILD)/$(COMPONENT)/$(OBJDIR)
    97 -DEPPATH  = $(POCO_BUILD)/$(COMPONENT)/$(DEPDIR)
    98  
    99  ifeq ($(POCO_BASE),$(PROJECT_BASE))
    100  POCO_LIBRARY =
    101 diff -ur build.orig/rules/lib build/rules/lib
    102 --- build.orig/rules/lib        2008-05-15 12:56:50.000000000 +0200
    103 +++ build/rules/lib     2008-05-15 12:59:18.000000000 +0200
    104 @@ -70,8 +70,3 @@
    105         $(SHLIBLN) $(LIB_RELEASE_SHARED) $(LIB_RELEASE_SHARED_LINK)
    106         $(STRIPCMD)
    107         $(postbuild)
    108 -
    109 -#
    110 -# Include the automatically generated dependency files
    111 -#
    112 -sinclude $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
    113 diff -ur build.orig/rules/sample build/rules/sample
    114 --- build.orig/rules/sample     2008-05-15 12:56:50.000000000 +0200
    115 +++ build/rules/sample  2008-05-15 12:59:34.000000000 +0200
    116 @@ -43,12 +43,10 @@
    117  LIBDIR   = lib
    118  BINDIR   = bin
    119  OBJDIR   = obj
    120 -DEPDIR   = .dep
    121  INCPATH  = $(POCO_BASE)/$(INCDIR)
    122  LIBPATH  = $(POCO_BASE)/$(LIBDIR)
    123  BINPATH  = $(BINDIR)
    124  OBJPATH  = $(OBJDIR)
    125 -DEPPATH  = $(DEPDIR)
    126  
    127  #
    128  # Determine link mode