adjust makefiles

SynoCommunity · Apr 9, 2021 · 29c4c99 · 29c4c99
1 parent aea77f2
commit 29c4c99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/cross/ejabberd/Makefile b/cross/ejabberd/Makefile
@@ -8,7 +8,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 BUILD_DEPENDS = native/erlang 
 DEPENDS = cross/ncurses cross/erlang cross/expat cross/zlib cross/openssl cross/libyaml
 
-# PPC archs except qoriq have too old compiler
+# PPC archs except qoriq have compiler errors with 64 bit values
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
 HOMEPAGE = https://www.ejabberd.im
@@ -25,6 +25,8 @@ CONFIGURE_ARGS += --enable-mysql
 # for 'rebar configure-deps' + 'rebar compile' to find cross compiled libei.a and liberl_interface.a
 # remarks: arguments for rebar are collected in 'vars.config'
 ADDITIONAL_LDFLAGS = -L$(STAGING_INSTALL_PREFIX)/lib/erlang/usr/lib
+ADDITIONAL_CFLAGS = -I$(STAGING_INSTALL_PREFIX)/lib/erlang/usr/include
+ADDITIONAL_CPPFLAGS = $(ADDITIONAL_CFLAGS)
 
 PRE_CONFIGURE_TARGET = ejabberd_pre_configure
 POST_INSTALL_TARGET = ejabberd_post_install

diff --git a/cross/erlang/Makefile b/cross/erlang/Makefile
@@ -2,15 +2,15 @@ PKG_NAME = erlang
 PKG_VERS = 23.2.5
 PKG_EXT = tar.gz
 PKG_DIST_NAME = OTP-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://www.erlang.org/download/
+PKG_DIST_SITE = https://github.com/erlang/otp/archive
 PKG_DIST_FILE = $(PKG_NAME)-OTP-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = otp-OTP-$(PKG_VERS)
 
 DEPENDS = native/$(PKG_NAME) cross/ncurses cross/openssl
 
 HOMEPAGE = https://www.erlang.org
 COMMENT  = Erlang is a programming language used to build massively scalable soft real-time systems with requirements on high availability.
-LICENSE  = Erlang Public License
+LICENSE  = Apache 2.0
 
 NATIVE_ERLANG_BIN_DIR = $(realpath $(WORK_DIR)/../../../native/erlang/work-native/install/usr/local/bin)
 ENV = PATH=$$PATH:$(NATIVE_ERLANG_BIN_DIR)

diff --git a/native/erlang/Makefile b/native/erlang/Makefile
@@ -10,11 +10,10 @@ DEPENDS =
 
 HOMEPAGE = https://erlang.org
 COMMENT  = Erlang is a programming language used to build massively scalable soft real-time systems with requirements on high availability.
-LICENSE  = Erlang Public License
+LICENSE  = Apache 2.0
 
 PRE_CONFIGURE_TARGET = erlang_pre_configure
 CONFIGURE_TARGET = erlang_configure
-COMPILE_TARGET = erlang_compile
 INSTALL_TARGET = erlang_install
 
 CONFIGURE_ARGS  = --without-javac
@@ -34,9 +33,6 @@ erlang_pre_configure:
 erlang_configure:
 	$(RUN) ./otp_build configure $(CONFIGURE_ARGS)
 
-.PHONY: erlang_compile
-erlang_compile:
-	$(RUN) make
 
 .PHONY: erlang_install
 erlang_install: