Skip to content

GitLab

Commit bd6ea0c9 authored by Dmitri Konstantinov's avatar Dmitri Konstantinov
Browse files

Delete hadoop-2.7.5.1.patch and hadoop_xrootd-1.0.4.patch patches as non needed

parent 695e5b92
Pipeline #1278386 passed with stage
in 5 minutes and 12 seconds
Hide whitespace changes
Inline Side-by-side
externals/patches/hadoop-2.7.5.1.patch deleted 100644 → 0
View file @ 695e5b92
--- hadoop-common-project/hadoop-common/src/JNIFlags.cmake.orig 2019-08-20 17:45:24.070529269 +0200
+++ hadoop-common-project/hadoop-common/src/JNIFlags.cmake 2019-08-20 17:45:46.444138559 +0200
@@ -91,6 +91,7 @@
"${_JAVA_HOME}/jre/lib/${_java_libarch}"
"${_JAVA_HOME}/jre/lib/*"
"${_JAVA_HOME}/jre/lib"
+ "${_JAVA_HOME}/lib/${_java_libarch}/*"
"${_JAVA_HOME}/lib/*"
"${_JAVA_HOME}/lib"
"${_JAVA_HOME}/include/*"
--- hadoop-common-project/hadoop-annotations/pom.xml.orig 2019-08-21 12:25:21.159115254 +0200
+++ hadoop-common-project/hadoop-annotations/pom.xml 2019-08-21 12:26:06.259322854 +0200
@@ -50,7 +50,7 @@
<artifactId>jdk.tools</artifactId>
<version>1.7</version>
<scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ <systemPath>${java.home}/lib/tools.jar</systemPath>
</dependency>
</dependencies>
</profile>
@@ -65,7 +65,7 @@
<artifactId>jdk.tools</artifactId>
<version>1.8</version>
<scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ <systemPath>${java.home}/lib/tools.jar</systemPath>
</dependency>
</dependencies>
</profile>
externals/patches/hadoop_xrootd-1.0.4.patch deleted 100644 → 0
View file @ 695e5b92
--- pom.xml.orig 2019-06-21 14:48:09.000000000 +0200
+++ pom.xml 2019-08-22 11:21:40.357333005 +0200
@@ -33,6 +33,40 @@
</exclusions>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk1.7</id>
+ <activation>
+ <jdk>1.7</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ <version>1.7</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jdk1.8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ <version>1.8</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
@@ -60,6 +94,7 @@
<name>XrdUtils</name>
</sysLib>
</sysLibs>
+ <name>g++</name>
</linker>
<libraries>
<library>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment