[85985] trunk/dports/devel/cryptlib
ryandesign at macports.org
ryandesign at macports.org
Mon Oct 17 20:11:41 PDT 2011
Revision: 85985
http://trac.macports.org/changeset/85985
Author: ryandesign at macports.org
Date: 2011-10-17 20:11:41 -0700 (Mon, 17 Oct 2011)
Log Message:
-----------
cryptlib: update to 3.4.1; ensure we're UsingTheRightCompiler and build_arch and install_name (#31637)
Modified Paths:
--------------
trunk/dports/devel/cryptlib/Portfile
trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h
Added Paths:
-----------
trunk/dports/devel/cryptlib/files/patch-makefile.diff
trunk/dports/devel/cryptlib/files/patch-tools-ccopts.sh.diff
Modified: trunk/dports/devel/cryptlib/Portfile
===================================================================
--- trunk/dports/devel/cryptlib/Portfile 2011-10-18 02:24:59 UTC (rev 85984)
+++ trunk/dports/devel/cryptlib/Portfile 2011-10-18 03:11:41 UTC (rev 85985)
@@ -3,7 +3,7 @@
PortSystem 1.0
name cryptlib
-version 3.4.0
+version 3.4.1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel security crypto
maintainers nomaintainer
@@ -27,8 +27,8 @@
distname cl[join [split $version .] ""]
use_zip yes
-checksums sha1 78f7599971c889a55346ddf858e3ef147a5270f0 \
- rmd160 d38cf69841942670f84e4c2d64a708f5cb3d4299
+checksums rmd160 2272e20697e3e1d8b484ae9d571b08371b1319fb \
+ sha256 d3057acbf4bc7d45694d8ec2621ee4027f9303d36cebdfe2af770567ec912c94
pre-extract {
# DOS to UNIX line endings.
@@ -36,6 +36,9 @@
}
extract.mkdir yes
+patchfiles patch-makefile.diff \
+ patch-tools-ccopts.sh.diff
+
use_configure no
pre-configure {
@@ -50,9 +53,10 @@
}
build.target default shared
-build.args LIBDIR="${prefix}/lib" \
- CFLAGS="${configure.cflags} ${configure.cc_archflags} -c -D__UNIX__ -DNDEBUG -I." \
- CC="${configure.cc}"
+build.env LIBDIR="${prefix}/lib" \
+ CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
+ LDFLAGS="${configure.ldflags} ${configure.ld_archflags}" \
+ CC="${configure.cc}"
destroot {
xinstall -m 644 ${worksrcpath}/libcl.a ${worksrcpath}/${cryptlibDylib} ${destroot}${prefix}/lib
Modified: trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h 2011-10-18 02:24:59 UTC (rev 85984)
+++ trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h 2011-10-18 03:11:41 UTC (rev 85985)
@@ -1,6 +1,6 @@
---- crypt/osconfig.h.orig 2010-12-19 04:14:06.000000000 -0600
-+++ crypt/osconfig.h 2011-04-27 07:05:00.000000000 -0500
-@@ -257,6 +257,10 @@
+--- crypt/osconfig.h.orig 2011-06-17 22:20:36.000000000 -0500
++++ crypt/osconfig.h 2011-10-16 23:51:19.000000000 -0500
+@@ -259,6 +259,10 @@
#else
#define L_ENDIAN
#endif
Added: trunk/dports/devel/cryptlib/files/patch-makefile.diff
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-makefile.diff (rev 0)
+++ trunk/dports/devel/cryptlib/files/patch-makefile.diff 2011-10-18 03:11:41 UTC (rev 85985)
@@ -0,0 +1,40 @@
+--- makefile.orig 2011-07-28 01:41:06.000000000 -0500
++++ makefile 2011-10-17 21:24:31.000000000 -0500
+@@ -70,8 +70,8 @@
+ # Further cc flags are gathered dynamically at runtime via the ccopts.sh
+ # script.
+
+-CFLAGS = "-c -D__UNIX__ -DNDEBUG -I."
+-CFLAGS_DEBUG = "-c -D__UNIX__ -I. -g3 -ggdb"
++CFLAGS += "-c -D__UNIX__ -DNDEBUG -I."
++CFLAGS_DEBUG = "$(CFLAGS) -c -D__UNIX__ -I. -g3 -ggdb"
+
+ # Paths and command names. We have to be careful with comments attached to
+ # path defines because some makes don't strip trailing spaces.
+@@ -87,7 +87,6 @@
+ SHARED_OBJ_DIR = ./shared-obj
+ CPP = $(CC) -E
+ LD = $(CC)
+-LDFLAGS =
+ AR = ar
+ SHELL = /bin/sh
+ OSNAME = `uname`
+@@ -1453,7 +1452,8 @@
+ $(EXTRAOBJS)
+
+ $(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
+- @$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
++ $(LD) $(LDFLAGS) -dynamiclib -install_name $(LIBDIR)/$(DYLIBNAME) \
++ -compatibility_version $(MAJ).$(MIN) \
+ -current_version $(MAJ).$(MIN).$(PLV) \
+ -o $(DYLIBNAME) $(OBJS) $(EXTRAOBJS)
+
+@@ -1847,7 +1847,7 @@
+ # decide to try it.
+
+ Darwin:
+- @make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer" LDFLAGS="-object -s"
++ @make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer"
+
+ # NCR MP-RAS: Use the NCR cc. The "-DNCR_UST" is needed to enable threading
+ # (User-Space Threads).
Added: trunk/dports/devel/cryptlib/files/patch-tools-ccopts.sh.diff
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-tools-ccopts.sh.diff (rev 0)
+++ trunk/dports/devel/cryptlib/files/patch-tools-ccopts.sh.diff 2011-10-18 03:11:41 UTC (rev 85985)
@@ -0,0 +1,11 @@
+--- tools/ccopts.sh.orig 2010-12-19 00:57:12.000000000 -0600
++++ tools/ccopts.sh 2011-10-17 21:27:53.000000000 -0500
+@@ -268,7 +268,7 @@
+ # worked since at least 2.7.2 although it wasn't actually documented until
+ # the first 3.x releases).
+
+-GCC_VER=`gcc -dumpversion | tr -d '.' | cut -c 1-2`
++GCC_VER=`$CC -dumpversion | tr -d '.' | cut -c 1-2`
+
+ # Try and determine the CPU type. This is made more complex by a pile of
+ # *BSE's which, along with antideluvian tools like an as that doesn't
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111017/96a3d72b/attachment.html>
More information about the macports-changes
mailing list