diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index 48f92457c2dcb26722e233239ef45713736c2d1c..65cddc0728e3c73eb2cfd9d008d44bb27a9fc6be 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -22,6 +22,7 @@ <!-- Depend on classes instead of jars where available --> <classpath> <pathelement location="../../../core/java/build/obj" /> + <pathelement location="../../../core/java/build/gnu-getopt.jar" /> <pathelement location="../../../router/java/build/obj" /> <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" /> <pathelement location="../../jetty/jettylib/jetty-util.jar" /> @@ -65,6 +66,8 @@ <compilerarg line="${javac.compilerargs}" /> <classpath> <pathelement location="../../../core/java/build/i2p.jar" /> + <!-- gnu-getopt.jar only present for debian builds --> + <pathelement location="../../../core/java/build/gnu-getopt.jar" /> <pathelement location="../../../router/java/build/router.jar" /> <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" /> <pathelement location="../../jetty/jettylib/jetty-http.jar" /> diff --git a/debian-alt/bionic/patches/0004-getopt-build.patch b/debian-alt/bionic/patches/0004-getopt-build.patch deleted file mode 100644 index 698dfe7177c629e5ddb16cfdceefc646a1d2bb1f..0000000000000000000000000000000000000000 --- a/debian-alt/bionic/patches/0004-getopt-build.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/apps/routerconsole/java/build.xml -+++ b/apps/routerconsole/java/build.xml -@@ -22,6 +22,7 @@ - <!-- Depend on classes instead of jars where available --> - <classpath> - <pathelement location="../../../core/java/build/obj" /> -+ <pathelement location="../../../core/java/build/gnu-getopt.jar" /> - <pathelement location="../../../router/java/build/obj" /> - <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" /> - <pathelement location="../../jetty/jettylib/jetty-util.jar" /> -@@ -65,6 +66,8 @@ - <compilerarg line="${javac.compilerargs}" /> - <classpath> - <pathelement location="../../../core/java/build/i2p.jar" /> -+ <!-- gnu-getopt.jar only present for debian builds --> -+ <pathelement location="../../../core/java/build/gnu-getopt.jar" /> - <pathelement location="../../../router/java/build/router.jar" /> - <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" /> - <pathelement location="../../jetty/jettylib/jetty-http.jar" /> diff --git a/debian-alt/bionic/patches/series b/debian-alt/bionic/patches/series index 357bbc52b8558e42da77739b6436dc70164846a3..5fabbd7e7c0020b71b1289068ed5ebd339359eae 100644 --- a/debian-alt/bionic/patches/series +++ b/debian-alt/bionic/patches/series @@ -1,3 +1,2 @@ 0001-path-substitution.patch 0002-jetty-compatibility.patch -0004-getopt-build.patch