diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-01-25 23:38:54 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-01-25 23:38:54 +0100 |
| commit | c63468158ad2e12ffee4d37474f04fbf6068818b (patch) | |
| tree | bcbc7d2cfba3f9110ab78b92a75e964499d33e66 /package | |
| parent | d787919ca32f7b8ce29b64f7d9f9b4c1d79c7e29 (diff) | |
| parent | 093f117aabce8d1e980c483e1f10e8b0d1b48ae8 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/openjdk8/Makefile | 3 | ||||
| -rw-r--r-- | package/perl/Makefile | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/openjdk8/Makefile b/package/openjdk8/Makefile index 5b482fee1..66b82d7a4 100644 --- a/package/openjdk8/Makefile +++ b/package/openjdk8/Makefile @@ -35,10 +35,11 @@ ifeq ($(ADK_TARGET_CPU_ARCH),x86_64) JDKARCH:= amd64 endif +TARGET_LDFLAGS:= -lm # uclibc-ng with iconv-tiny/libiconv needs -liconv ifeq ($(ADK_TARGET_LIBC_ICONV),) ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y) -TARGET_LDFLAGS:= -liconv -lm +TARGET_LDFLAGS+= -liconv endif endif diff --git a/package/perl/Makefile b/package/perl/Makefile index a2c465cbc..b4c1008cf 100644 --- a/package/perl/Makefile +++ b/package/perl/Makefile @@ -59,7 +59,6 @@ perl-install: ${CP} ${WRKINST}/usr/lib/perl5/${PKG_VERSION}/* \ ${IDIR_PERL}/usr/lib/perl5/${PKG_VERSION} ${INSTALL_BIN} ${WRKINST}/usr/bin/perl ${IDIR_PERL}/usr/bin/ - touch $(IDIR_PERL)/usr/lib/perl5/$(PKG_VERSION)/$(ADK_TARGET_ARCH)-linux/CORE/patchlevel-debian.h rm -rf $(IDIR_PERL)/usr/lib/perl5/pod find $(IDIR_PERL)/usr/lib/perl5/ -name 'extralibs.ld' -print0 | xargs -0 rm -f find $(IDIR_PERL)/usr/lib/perl5/ -name '*.bs' -print0 | xargs -0 rm -f |