forked from pool/maven-native
This commit is contained in:
parent
017efc4fc5
commit
8edfc5d077
@ -30,7 +30,6 @@ Source1: plexus_components-bcc.xml
|
||||
Source2: plexus_components-generic-c.xml
|
||||
Source3: plexus_components-manager.xml
|
||||
Source4: plexus_components-msvc.xml
|
||||
Patch0: stack-overflow.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: maven-local
|
||||
@ -80,7 +79,6 @@ This package contains javadoc for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{namedversion}
|
||||
%patch0 -p1
|
||||
|
||||
for d in LICENSE ; do
|
||||
iconv -f iso8859-1 -t utf-8 $d.txt > $d.txt.conv && mv -f $d.txt.conv $d.txt
|
||||
|
@ -1,23 +0,0 @@
|
||||
diff -urEbwB maven-native-1.0-alpha-11.orig/maven-native-api/src/main/java/org/codehaus/mojo/natives/Dependency.java maven-native-1.0-alpha-11/maven-native-api/src/main/java/org/codehaus/mojo/natives/Dependency.java
|
||||
--- maven-native-1.0-alpha-11.orig/maven-native-api/src/main/java/org/codehaus/mojo/natives/Dependency.java 2022-04-04 18:21:20.052196462 +0200
|
||||
+++ maven-native-1.0-alpha-11/maven-native-api/src/main/java/org/codehaus/mojo/natives/Dependency.java 2022-04-04 18:23:05.060895910 +0200
|
||||
@@ -115,8 +115,10 @@
|
||||
for ( int i = 0; i < this.getDependencies().size(); ++i )
|
||||
{
|
||||
Dependency depend = this.getDependencies().get( i );
|
||||
+ if (depend != this) {
|
||||
depend.analyze();
|
||||
}
|
||||
+ }
|
||||
|
||||
}
|
||||
|
||||
@@ -315,7 +317,7 @@
|
||||
for ( int i = 0; i < this.getDependencies().size(); ++i )
|
||||
{
|
||||
Dependency node = this.getDependencies().get( i );
|
||||
- if ( node.contains( dependent ) )
|
||||
+ if ( node != this && node.contains( dependent ) )
|
||||
{
|
||||
return true;
|
||||
}
|
Loading…
Reference in New Issue
Block a user