[131254] trunk/dports/perl/p5-mac-carbon

larryv at macports.org larryv at macports.org
Wed Jan 7 11:07:28 PST 2015


Revision: 131254
          https://trac.macports.org/changeset/131254
Author:   larryv at macports.org
Date:     2015-01-07 11:07:28 -0800 (Wed, 07 Jan 2015)
Log Message:
-----------
p5-mac-carbon: Revert r131249

Unintentional commit. Sad trombone.

Revision Links:
--------------
    https://trac.macports.org/changeset/131249

Modified Paths:
--------------
    trunk/dports/perl/p5-mac-carbon/Portfile

Removed Paths:
-------------
    trunk/dports/perl/p5-mac-carbon/files/fix-linking.patch

Modified: trunk/dports/perl/p5-mac-carbon/Portfile
===================================================================
--- trunk/dports/perl/p5-mac-carbon/Portfile	2015-01-07 19:04:47 UTC (rev 131253)
+++ trunk/dports/perl/p5-mac-carbon/Portfile	2015-01-07 19:07:28 UTC (rev 131254)
@@ -24,8 +24,6 @@
 if {${perl5.major} != ""} {
     supported_archs     i386 ppc
     patchfiles          avoid-FlatCarbon-headers.patch \
-                        fix-linking.patch \
                         no-arch-flag.patch
-    compiler.library_path
     configure.post_args TRY_ANYWAY=1
 }

Deleted: trunk/dports/perl/p5-mac-carbon/files/fix-linking.patch
===================================================================
--- trunk/dports/perl/p5-mac-carbon/files/fix-linking.patch	2015-01-07 19:04:47 UTC (rev 131253)
+++ trunk/dports/perl/p5-mac-carbon/files/fix-linking.patch	2015-01-07 19:07:28 UTC (rev 131254)
@@ -1,33 +0,0 @@
-Index: AppleEvents/Makefile.PL
-===================================================================
---- AppleEvents/Makefile.PL.orig
-+++ AppleEvents/Makefile.PL
-@@ -5,7 +5,6 @@ use vars qw(%ARGS);
- do(catfile(updir(), 'common.pl'));
- 
- if ($^O eq 'darwin') {
--	$ARGS{'LD'}		= 'c++';
- 	$ARGS{'OBJECT'}		= 'AppleEvents.o PerlAEUtils.o';
- 
- 	# i'm sure there's a way to tell MakeMaker to use .cp,
-Index: common.pl
-===================================================================
---- common.pl.orig
-+++ common.pl
-@@ -47,6 +47,8 @@ if ($^O eq 'darwin') {
- 	$ARGS{'depend'}{$C}     = catfile($BASEDIR, 'Carbon.h');
- 
- 	$ARGS{'LDFLAGS'}        = $Config{ldflags};
-+	$ARGS{'LDFLAGS'}        =~ s/-L\S+//;
-+
- 	$ARGS{'CCFLAGS'}        = $Config{ccflags} . ' -fpascal-strings';
- #	$ARGS{'LDDLFLAGS'}      = '-dynamiclib -prebind -flat_namespace -undefined suppress -framework Carbon';
- #	$ARGS{'DLEXT'}          = 'dylib';
-@@ -54,6 +56,7 @@ if ($^O eq 'darwin') {
- 	$ARGS{'LDDLFLAGS'}      = $Config{lddlflags};
- 	$ARGS{'LDDLFLAGS'}      =~ s/-undefined\s+\w+//;
- 	$ARGS{'LDDLFLAGS'}      =~ s/-bundle\b//;
-+	$ARGS{'LDDLFLAGS'}      =~ s/-L\S+//;
- 	$ARGS{'LDDLFLAGS'}      .= ' -bundle -flat_namespace -undefined suppress -framework Carbon';
- 
- 	fixargs(\%ARGS);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150107/2670d302/attachment.html>


More information about the macports-changes mailing list