diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-02-12 13:42:35 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-02-12 13:42:35 +0000 |
| commit | 820695d755807f60392bc80a6ac44b5452652372 (patch) | |
| tree | 54e44a64f4e1a45e03f92481ee2cc39c543a7bb2 /dev-java/lz4-java | |
| parent | 1c3ef609c76b7f3ddabc442fc53f787ef51a9aeb (diff) | |
| download | baldeagleos-repo-820695d755807f60392bc80a6ac44b5452652372.tar.gz baldeagleos-repo-820695d755807f60392bc80a6ac44b5452652372.tar.xz baldeagleos-repo-820695d755807f60392bc80a6ac44b5452652372.zip | |
Adding metadata
Diffstat (limited to 'dev-java/lz4-java')
| -rw-r--r-- | dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile (renamed from dev-java/lz4-java/files/lz4-java-1.8.0-Makefile) | 6 | ||||
| -rw-r--r-- | dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild (renamed from dev-java/lz4-java/lz4-java-1.8.0.ebuild) | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-Makefile b/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile index 8d59aa8df84a..4a766552c65e 100644 --- a/dev-java/lz4-java/files/lz4-java-1.8.0-Makefile +++ b/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile @@ -27,11 +27,11 @@ SONAME = liblz4-java.so # C compiler arguments may be obtained by running 'ant -v compile-jni', # as long as dev-java/cpptasks is in the classpath CFLAGS := -fPIC $(CFLAGS) -# '--as-needed' causes test failure -LDFLAGS := $(LDFLAGS) -Wl,--no-as-needed $(OUT_DIR)/$(SONAME): $(OBJS) | $(OUT_DIR) - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ -llz4 $^ + # '-llz4' must be listed after this package's objects + # https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Importance_of_linking_order + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ $^ -llz4 $(OBJS_DIR_PREFIX)/%.o: %.c | $(OBJS_DIR) $(CC) $(CFLAGS) -c -o $@ \ diff --git a/dev-java/lz4-java/lz4-java-1.8.0.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild index 15c53d947049..dcaf10bc45d5 100644 --- a/dev-java/lz4-java/lz4-java-1.8.0.ebuild +++ b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild @@ -20,12 +20,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" # be packaged. Some extra steps are required before running the tests: # 1. Download junit4-ant 2.7.x from https://mvnrepository.com/artifact/com.carrotsearch.randomizedtesting/junit4-ant # 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to junit4-ant-2.7.*.jar -# 3. arm, arm64 and ppc64 only: Install test dependencies that are unkeyworded +# 3. ppc64 only: Install test dependencies that are unkeyworded # 4. Set ALLOW_TEST="all" RESTRICT="test" CDEPEND=" - app-arch/lz4 + app-arch/lz4:= " # The version requirement on mvel is strict; mvel-2.4.* generates source files @@ -36,9 +36,9 @@ DEPEND=" dev-libs/xxhash test? ( dev-java/junit:4 - !arm? ( !arm64? ( !ppc64? ( + !ppc64? ( dev-java/randomized-runner:0 - ) ) ) + ) ) ${CDEPEND} " @@ -68,7 +68,7 @@ pkg_setup() { src_prepare() { eapply "${FILESDIR}/${P}-print-os-props.patch" eapply "${FILESDIR}/${P}-skip-ivy.patch" - cp "${FILESDIR}/${P}-Makefile" Makefile || die "Failed to copy Makefile" + cp "${FILESDIR}/${P}-r1-Makefile" Makefile || die "Failed to copy Makefile" cp "${FILESDIR}/${P}-gentoo-classpath.xml" gentoo-classpath.xml || die "Failed to copy Gentoo classpath injection XML" java-pkg-2_src_prepare |