[112947] trunk/dports/net/nxcomp
cal at macports.org
cal at macports.org
Mon Nov 4 16:49:51 PST 2013
Revision: 112947
https://trac.macports.org/changeset/112947
Author: cal at macports.org
Date: 2013-11-04 16:49:51 -0800 (Mon, 04 Nov 2013)
Log Message:
-----------
nxproxy, nxcomp: Don't get stuck when trying to call makedepend, which is only a X11 stub. Fix build of nxcomp against libc++ by not relying on implementation details.
Modified Paths:
--------------
trunk/dports/net/nxcomp/Portfile
trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff
trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff
Added Paths:
-----------
trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff
Modified: trunk/dports/net/nxcomp/Portfile
===================================================================
--- trunk/dports/net/nxcomp/Portfile 2013-11-05 00:49:50 UTC (rev 112946)
+++ trunk/dports/net/nxcomp/Portfile 2013-11-05 00:49:51 UTC (rev 112947)
@@ -25,6 +25,8 @@
universal_variant yes
supported_archs ppc i386 x86_64
+depends_build port:makedepend
+
depends_lib port:libpng \
port:jpeg \
port:zlib \
@@ -39,7 +41,8 @@
worksrcdir nx-libs-${version}/nxcomp
patchfiles patch-nxcomp__configure.in.diff \
- patch-nxcomp__Makefile.in.diff
+ patch-nxcomp__Makefile.in.diff \
+ patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff
}
subport nxproxy {
Added: trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff (rev 0)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff 2013-11-05 00:49:51 UTC (rev 112947)
@@ -0,0 +1,37 @@
+--- Types.h.orig 2013-11-05 01:35:22.000000000 +0100
++++ Types.h 2013-11-05 01:37:30.000000000 +0100
+@@ -55,6 +55,9 @@
+ return &*(vector < unsigned char >::begin());
+ }
+
++ // Avoid overriding clear() when using libc++. Fiddling with STL internals
++ // doesn't really seem like a good idea to me anyway.
++ #ifndef _LIBCPP_VECTOR
+ void clear()
+ {
+ #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+@@ -95,12 +98,16 @@
+
+ #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+ }
++ #endif /* #ifdef _LIBCPP_VECTOR */
+ };
+
+ class T_messages : public vector < Message * >
+ {
+ public:
+
++ // Avoid overriding clear() when using libc++. Fiddling with STL internals
++ // doesn't really seem like a good idea to me anyway.
++ #ifndef _LIBCPP_VECTOR
+ void clear()
+ {
+ #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+@@ -141,6 +148,7 @@
+
+ #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+ }
++ #endif /* #ifndef _LIBCPP_VECTOR */
+ };
+
+ typedef md5_byte_t * T_checksum;
Modified: trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff 2013-11-05 00:49:50 UTC (rev 112946)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff 2013-11-05 00:49:51 UTC (rev 112947)
@@ -1,5 +1,5 @@
---- configure.in.orig 2013-03-05 00:20:31.000000000 +0100
-+++ configure.in 2013-03-05 00:20:38.000000000 +0100
+--- configure.in.orig 2013-11-05 01:12:25.000000000 +0100
++++ configure.in 2013-11-05 01:12:56.000000000 +0100
@@ -187,7 +187,7 @@
dnl the options -G -h.
@@ -9,3 +9,25 @@
elif test "$SUN" = yes; then
LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
else
+@@ -362,20 +362,7 @@
+ dnl Find makedepend somewhere.
+
+ AC_SUBST(MAKEDEPEND)
+-
+-if test -x "../nx-X11/config/makedepend/makedepend" ; then
+- MAKEDEPEND=../nx-X11/config/makedepend/makedepend
+-else
+- if test -x "/usr/X11R6/bin/makedepend" ; then
+- MAKEDEPEND=/usr/X11R6/bin/makedepend
+- else
+- if test -x "/usr/openwin/bin/makedepend" ; then
+- MAKEDEPEND=/usr/openwin/bin/makedepend
+- else
+- MAKEDEPEND=/usr/bin/makedepend
+- fi
+- fi
+-fi
++MAKEDEPEND=`which makedepend`
+
+ dnl Determine what to build based on the platform.
+ dnl Override the LIBS settings on Cygwin32 so that
Modified: trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff 2013-11-05 00:49:50 UTC (rev 112946)
+++ trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff 2013-11-05 00:49:51 UTC (rev 112947)
@@ -1,6 +1,6 @@
---- configure.in.orig 2013-03-05 00:33:47.000000000 +0100
-+++ configure.in 2013-03-05 00:35:11.000000000 +0100
-@@ -161,7 +161,7 @@
+--- configure.in.orig 2013-11-05 01:45:25.000000000 +0100
++++ configure.in 2013-11-05 01:46:40.000000000 +0100
+@@ -161,25 +161,12 @@
if test "$CYGWIN32" = yes; then
LIBS="$LIBS -L../nxcomp -lXcomp -lstdc++ -Wl,-e,_mainCRTStartup -ljpeg -lpng -lz"
else
@@ -9,3 +9,22 @@
fi
dnl Find makedepend somewhere.
+
+ AC_SUBST(MAKEDEPEND)
+-
+-if test -x "../nx-X11/config/makedepend/makedepend" ; then
+- MAKEDEPEND=../nx-X11/config/makedepend/makedepend
+-else
+- if test -x "/usr/X11R6/bin/makedepend" ; then
+- MAKEDEPEND=/usr/X11R6/bin/makedepend
+- else
+- if test -x "/usr/openwin/bin/makedepend" ; then
+- MAKEDEPEND=/usr/openwin/bin/makedepend
+- else
+- MAKEDEPEND=makedepend
+- fi
+- fi
+-fi
++MAKEDEPEND=`which makedepend`
+
+ AC_OUTPUT(Makefile)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131104/74cfb247/attachment.html>
More information about the macports-changes
mailing list