From 5e56a336adbd4eb44bdddb893961bbbd9b3e443a Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 12 Sep 2013 01:08:05 +0200 Subject: Remove cpptasks archive, using --- .../cpptasks/cpptasks-1.0b5-accumulated.patch | 80 --------------------- .../archive/cpptasks/cpptasks-1.0b5.patches.txt | 6 -- make/lib/archive/cpptasks/cpptasks-1.0b5.zip | Bin 2221439 -> 0 bytes .../cpptasks/obsolete/cpptasks-1.0b5-darwin.patch | 70 ------------------ .../obsolete/cpptasks-1.0b5-gcclinker.patch | 17 ----- ...c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz | Bin 7743 -> 0 bytes make/lib/cpptasks-version.txt | 14 +--- 7 files changed, 3 insertions(+), 184 deletions(-) delete mode 100644 make/lib/archive/cpptasks/cpptasks-1.0b5-accumulated.patch delete mode 100644 make/lib/archive/cpptasks/cpptasks-1.0b5.patches.txt delete mode 100644 make/lib/archive/cpptasks/cpptasks-1.0b5.zip delete mode 100644 make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-darwin.patch delete mode 100644 make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-gcclinker.patch delete mode 100644 make/lib/archive/cpptasks/obsolete/cpptasks-patch-suncc-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz diff --git a/make/lib/archive/cpptasks/cpptasks-1.0b5-accumulated.patch b/make/lib/archive/cpptasks/cpptasks-1.0b5-accumulated.patch deleted file mode 100644 index 4965a22..0000000 --- a/make/lib/archive/cpptasks/cpptasks-1.0b5-accumulated.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Nur cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java cpptasks-1.0b5-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java ---- cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java 2012-03-06 19:39:46.739351056 +0100 -@@ -59,7 +59,7 @@ - args.addElement("-bundle"); - } else { - if (linkType.isSharedLibrary()) { -- args.addElement("-prebind"); -+ // args.addElement("-prebind"); // Only required for OSX 10.3 and earlier, no auto-add (can add manually though) - args.addElement("-dynamiclib"); - } - } -diff -Nur cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java cpptasks-1.0b5-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java ---- cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java 2012-03-06 19:42:21.241385093 +0100 -@@ -17,6 +17,8 @@ - package net.sf.antcontrib.cpptasks.gcc; - import java.io.File; - import java.util.Vector; -+import java.util.HashSet; -+import java.util.Arrays; - - import net.sf.antcontrib.cpptasks.CUtil; - import net.sf.antcontrib.cpptasks.compiler.LinkType; -@@ -33,9 +35,10 @@ - private static final String[] libtoolObjFiles = new String[]{".fo", ".a", - ".lib", ".dll", ".so", ".sl"}; - private static String[] linkerOptions = new String[]{"-bundle", -- "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s", -+ "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-noprebind", "-s", - "-static", "-shared", "-symbolic", "-Xlinker", - "--export-all-symbols", "-static-libgcc",}; -+ private static String[] darwinLinkerOptions = new String[]{"-arch", "-weak_framework", "-lazy_framework", "-weak_library" }; - private static final GccLinker dllLinker = new GccLinker("gcc", objFiles, - discardFiles, "lib", ".so", false, new GccLinker("gcc", objFiles, - discardFiles, "lib", ".so", true, null)); -@@ -78,6 +81,9 @@ - */ - public String decorateLinkerOption(StringBuffer buf, String arg) { - String decoratedArg = arg; -+ if (arg.startsWith("--sysroot")) { -+ return arg; -+ } - if (arg.length() > 1 && arg.charAt(0) == '-') { - switch (arg.charAt(1)) { - // -@@ -97,12 +103,13 @@ - break; - default : - boolean known = false; -- for (int i = 0; i < linkerOptions.length; i++) { -- if (linkerOptions[i].equals(arg)) { -- known = true; -- break; -- } -+ HashSet allLinkerOptions = new HashSet(); -+ allLinkerOptions.addAll(Arrays.asList(linkerOptions)); -+ if (isDarwin()) { -+ allLinkerOptions.addAll(Arrays.asList(darwinLinkerOptions)); - } -+ known = allLinkerOptions.contains(arg); -+ - if (!known) { - buf.setLength(0); - buf.append("-Wl,"); -diff -Nur cpptasks-1.0b5/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java cpptasks-1.0b5-patched/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java ---- cpptasks-1.0b5/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-patched/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java 2012-03-06 19:39:46.891349119 +0100 -@@ -73,9 +73,8 @@ - pluginOutType.setValue("shared"); - pluginType.setOutputType(pluginOutType); - linker.addImpliedArgs(false, pluginType, args); -- assertEquals(2, args.size()); -- assertEquals("-prebind", args.elementAt(0)); -- assertEquals("-dynamiclib", args.elementAt(1)); -+ assertEquals(1, args.size()); -+ assertEquals("-dynamiclib", args.elementAt(0)); - } - /** - * Checks for proper arguments for plugin generation on Darwin diff --git a/make/lib/archive/cpptasks/cpptasks-1.0b5.patches.txt b/make/lib/archive/cpptasks/cpptasks-1.0b5.patches.txt deleted file mode 100644 index c8136b1..0000000 --- a/make/lib/archive/cpptasks/cpptasks-1.0b5.patches.txt +++ /dev/null @@ -1,6 +0,0 @@ -cpptasks-1.0b5-accumulated.patch - The accumulated patch, you only need to apply this one! - -The single original patches: - -obsolete/cpptasks-1.0b5-darwin.patch - Make OSX/Darwin work (linker options etc) -obsolete/cpptasks-1.0b5-gcclinker.patch - Make crosscompilation work (--sysroot .. etc) diff --git a/make/lib/archive/cpptasks/cpptasks-1.0b5.zip b/make/lib/archive/cpptasks/cpptasks-1.0b5.zip deleted file mode 100644 index 21f8c07..0000000 Binary files a/make/lib/archive/cpptasks/cpptasks-1.0b5.zip and /dev/null differ diff --git a/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-darwin.patch b/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-darwin.patch deleted file mode 100644 index 8af11be..0000000 --- a/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-darwin.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java cpptasks-1.0b5-osx-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java ---- cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-osx-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java 2012-01-09 14:40:36.277639850 +0100 -@@ -59,7 +59,7 @@ - args.addElement("-bundle"); - } else { - if (linkType.isSharedLibrary()) { -- args.addElement("-prebind"); -+ // args.addElement("-prebind"); // Only required for OSX 10.3 and earlier, no auto-add (can add manually though) - args.addElement("-dynamiclib"); - } - } -diff -Nur cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java cpptasks-1.0b5-osx-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java ---- cpptasks-1.0b5/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-osx-patched/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java 2012-01-09 15:25:12.994904288 +0100 -@@ -17,6 +17,8 @@ - package net.sf.antcontrib.cpptasks.gcc; - import java.io.File; - import java.util.Vector; -+import java.util.HashSet; -+import java.util.Arrays; - - import net.sf.antcontrib.cpptasks.CUtil; - import net.sf.antcontrib.cpptasks.compiler.LinkType; -@@ -33,9 +35,10 @@ - private static final String[] libtoolObjFiles = new String[]{".fo", ".a", - ".lib", ".dll", ".so", ".sl"}; - private static String[] linkerOptions = new String[]{"-bundle", -- "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s", -+ "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-noprebind", "-s", - "-static", "-shared", "-symbolic", "-Xlinker", - "--export-all-symbols", "-static-libgcc",}; -+ private static String[] darwinLinkerOptions = new String[]{"-arch", "-weak_framework", "-lazy_framework", "-weak_library" }; - private static final GccLinker dllLinker = new GccLinker("gcc", objFiles, - discardFiles, "lib", ".so", false, new GccLinker("gcc", objFiles, - discardFiles, "lib", ".so", true, null)); -@@ -97,12 +100,13 @@ - break; - default : - boolean known = false; -- for (int i = 0; i < linkerOptions.length; i++) { -- if (linkerOptions[i].equals(arg)) { -- known = true; -- break; -- } -+ HashSet allLinkerOptions = new HashSet(); -+ allLinkerOptions.addAll(Arrays.asList(linkerOptions)); -+ if (isDarwin()) { -+ allLinkerOptions.addAll(Arrays.asList(darwinLinkerOptions)); - } -+ known = allLinkerOptions.contains(arg); -+ - if (!known) { - buf.setLength(0); - buf.append("-Wl,"); -diff -Nur cpptasks-1.0b5/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java cpptasks-1.0b5-osx-patched/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java ---- cpptasks-1.0b5/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java 2008-04-02 19:26:44.000000000 +0200 -+++ cpptasks-1.0b5-osx-patched/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java 2012-01-09 15:29:42.379687367 +0100 -@@ -73,9 +73,8 @@ - pluginOutType.setValue("shared"); - pluginType.setOutputType(pluginOutType); - linker.addImpliedArgs(false, pluginType, args); -- assertEquals(2, args.size()); -- assertEquals("-prebind", args.elementAt(0)); -- assertEquals("-dynamiclib", args.elementAt(1)); -+ assertEquals(1, args.size()); -+ assertEquals("-dynamiclib", args.elementAt(0)); - } - /** - * Checks for proper arguments for plugin generation on Darwin diff --git a/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-gcclinker.patch b/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-gcclinker.patch deleted file mode 100644 index 0eb4c76..0000000 --- a/make/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-gcclinker.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java -=================================================================== ---- src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java (revision 177) -+++ src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java (working copy) -@@ -78,6 +78,12 @@ - */ - public String decorateLinkerOption(StringBuffer buf, String arg) { - String decoratedArg = arg; -+ if (arg.startsWith("--sysroot")) { -+ return arg; -+ } -+ if (arg.startsWith("-nostdlib")) { -+ return arg; -+ } - if (arg.length() > 1 && arg.charAt(0) == '-') { - switch (arg.charAt(1)) { - // diff --git a/make/lib/archive/cpptasks/obsolete/cpptasks-patch-suncc-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz b/make/lib/archive/cpptasks/obsolete/cpptasks-patch-suncc-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz deleted file mode 100644 index 22f1cde..0000000 Binary files a/make/lib/archive/cpptasks/obsolete/cpptasks-patch-suncc-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz and /dev/null differ diff --git a/make/lib/cpptasks-version.txt b/make/lib/cpptasks-version.txt index 8c746d6..339d395 100755 --- a/make/lib/cpptasks-version.txt +++ b/make/lib/cpptasks-version.txt @@ -1,13 +1,5 @@ Current cpptasks is from - - -Version '1.0 beta 5' / r175: - - + -Plus the accumulated patches: - - cpptasks-1.0b5-darwin.patch - Make OSX/Darwin work (linker options etc) - - cpptasks-1.0b5-gcclinker.patch - Make crosscompilation work (--sysroot .. etc) - -See archive/cpptasks/ -and archive/cpptasks/cpptasks-1.0b5.patches.txt +Original cpptasks is from + -- cgit v1.2.3