<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2dff4bc8f6940bd1de2b94993cf49bd79e112dd8">https://github.com/macports/macports-ports/commit/2dff4bc8f6940bd1de2b94993cf49bd79e112dd8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2dff4bc poco: fix build issue and bump version to 1.8.0.1
</span>2dff4bc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2dff4bc8f6940bd1de2b94993cf49bd79e112dd8
</span>Author: Arjan van der Velde <vandervelde.ag@gmail.com>
AuthorDate: Sun Dec 17 09:45:25 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> poco: fix build issue and bump version to 1.8.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Bumped the version of this broken port to 1.8.0.1. This also this fixes (or supersedes) the build error in https://trac.macports.org/ticket/55112.
</span>---
devel/poco/Portfile | 53 +++++++-------
devel/poco/files/patch-rules-deps.diff | 122 ---------------------------------
2 files changed, 23 insertions(+), 152 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/poco/Portfile b/devel/poco/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 31bc2ce..df2aa7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/poco/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/poco/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,12 +3,13 @@
</span> PortSystem 1.0
name poco
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.0.1
</span> categories devel
maintainers nomaintainer
platforms darwin
license Boost-1
supported_archs i386 x86_64
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +sqlite
</span>
description POCO C++ Libraries
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,34 +22,30 @@ homepage http://pocoproject.org/
</span> master_sites ${homepage}releases/poco-[strsed ${version} {s/[^0-9.].*$//}]/
distname ${name}-${version}-all
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ff6069681246bafc546a842d92ec627b683b62fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 17506e0f7abc2a6e933ef0f46a6c5ca6f7cb599370b11979f4e61b604ada240f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 51b6d56429e118014e568443240b0e90a84c517d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 61f1e26e25af2201295b6a58a8e2bf74063ad3bf49c8e969ba08af42310716c2
</span>
set docdir ${prefix}/share/doc/${name}
if {${subport} eq ${name}} {
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set omit {NetSSL_OpenSSL Data/ODBC Data/MySQL Crypto}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set omit {NetSSL_OpenSSL Data/SQLite Data/ODBC Data/MySQL Crypto}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {"x86_64" eq ${configure.build_arch}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set darwin Darwin64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set darwin Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {[string match *clang* ${configure.compiler}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set config Darwin-clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set config ${darwin}-clang-libc++
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set config Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set config ${darwin}
</span> }
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Something in the dependency checking matches the macports.org in the path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# as a *.o file. It's all downhill from there. This patch removes the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# dependency (.dep) file creation & use from the Makefiles.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note future maintainers / contributors: you will find you won't need
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this patch when building outside the *macports.org* path. Don't remove it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# without testing within the *macports.org* build path. See ticket #19486.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-rules-deps.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --no-samples --config=${config}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --static --shared --no-samples --unbundled --config=${config}
</span>
# Make sure poco build uses the right compiler.
build.args-append CC=${configure.cc} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +53,8 @@ build.args-append CC=${configure.cc} \
</span> CPP=${configure.cpp} \
POCO_HOST_OSARCH=${configure.build_arch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:zlib port:pcre port:expat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
configure.args-append --omit=[join ${omit} ,]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,9 +69,7 @@ post-patch {
</span> }
use_parallel_build yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.target poco
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
test {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +101,6 @@ post-destroot {
</span> xinstall -d ${destroot}${docdir}/html
xinstall -m 0644 -W ${worksrcpath} CHANGELOG CONTRIBUTORS LICENSE NEWS README VERSION \
${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> xinstall -m 0644 -W ${worksrcpath}/doc Acknowledgements.html ${destroot}${docdir}/html
copy ${worksrcpath}/CppUnit/doc ${destroot}${docdir}/html/CppUnit
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,32 +117,29 @@ variant odbc description {Build ODBC backend for Data library} {
</span>
variant mysql description {Build MySQL backend for Data library} {
depends_lib-append path:bin/mysql_config5:mysql5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cppflags-append -I${prefix}/include/mysql5/mysql
configure.ldflags-append -L${prefix}/lib/mysql5/mysql
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set omit [ldelete ${omit} Data/MySQL]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant sqlite description {Build SQLite backend for Data library} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set omit [ldelete ${omit} Data/SQLite]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> }
subport ${name}-docs {
license unknown
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> description documentation for POCO
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description This port contains an offline copy of the POCO documentation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage ${homepage}documentation/
distname ${distname}-doc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 9ff1b461532cb7391ea631e33c6d288692c07dac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6fe1a541353580cf1d91b211e710d1d579b1ddc82a0a5fbcd9c8907063c77c81
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 237e1dca693c4e4985998d7d3f278d97663e8e4d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 867ca0983740514ba2ef266530340a6d56608c48e139a3e529bf622b5a1bfb4e
</span> use_configure no
build {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot {
xinstall -d ${destroot}${docdir}
copy ${worksrcpath} ${destroot}${docdir}/html
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/poco/files/patch-rules-deps.diff b/devel/poco/files/patch-rules-deps.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7ac18cf..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/poco/files/patch-rules-deps.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,122 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/rules/compile.orig 2012-01-23 08:12:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/rules/compile 2012-07-21 02:34:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,49 +33,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Rules for compiling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Compiling" $< "(debug, static)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Compiling" $< "(release, static)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Compiling" $< "(debug, static)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Compiling" $< "(release, static)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Compiling" $< "(debug, shared)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Compiling" $< "(release, shared)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Compiling" $< "(debug, shared)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Compiling" $< "(release, shared)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Rules for creating dependency information
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(DEPPATH)/%.d: $(SRCDIR)/%.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @echo "** Creating dependency info for" $^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MKDIR) $(DEPPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(DEP) $(SRCDIR)/$(patsubst %.d,%.cpp,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(DEPPATH)/%.d: $(SRCDIR)/%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @echo "** Creating dependency info for" $^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MKDIR) $(DEPPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(DEP) $(SRCDIR)/$(patsubst %.d,%.c,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--depend: $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/rules/dylib.orig 2012-01-23 08:12:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/rules/dylib 2012-07-21 02:32:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,8 +70,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Building dynamic library (release, static)" $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(DYLIB) $(DYLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(postbuild)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Include the automatically generated dependency files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--sinclude $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/rules/exec.orig 2012-01-23 08:12:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/rules/exec 2012-07-21 02:32:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,8 +60,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(STRIPCMD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(postbuild)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Include the automatically generated dependency files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--sinclude $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/rules/global.orig 2012-01-23 08:12:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/rules/global 2012-07-21 02:32:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,11 +157,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBDIR = lib/$(OSNAME)/$(OSARCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINDIR = bin/$(OSNAME)/$(OSARCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJDIR = obj/$(OSNAME)/$(OSARCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DEPDIR = .dep/$(OSNAME)/$(OSARCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBPATH = $(POCO_BUILD)/$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINPATH = $(POCO_BUILD)/$(COMPONENT)/$(BINDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJPATH = $(POCO_BUILD)/$(COMPONENT)/$(OBJDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DEPPATH = $(POCO_BUILD)/$(COMPONENT)/$(DEPDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POCO_HOST_BINDIR = bin/$(POCO_HOST_OSNAME)/$(POCO_HOST_OSARCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POCO_TARGET_BINDIR = $(BINDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/rules/lib.orig 2012-01-23 08:12:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/rules/lib 2012-07-21 02:32:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,8 +75,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SHLIBLN) $(LIB_RELEASE_SHARED) $(LIB_RELEASE_SHARED_LINK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(STRIPCMD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(postbuild)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Include the automatically generated dependency files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--sinclude $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/rules/sample.orig 2012-01-23 08:12:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/rules/sample 2012-07-21 02:32:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,12 +46,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBDIR = lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINDIR = bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJDIR = obj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DEPDIR = .dep
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCPATH = $(POCO_BASE)/$(INCDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBPATH = $(POCO_BASE)/$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINPATH = $(BINDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJPATH = $(OBJDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DEPPATH = $(DEPDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBPREFIX = lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>