Skip to contentSkip to conversation

Minor pkg-rebar updates

PATCH New Frank Hunleth 3 participants 6 messages Feb 16, 2015 – Feb 19, 2015

lore
Share & tools
lore
#0 lore raw

cover Minor pkg-rebar updates

I've been trying out the new rebar infrastructure with a few Erlang packages. Those packages aren't ready to contribute, but I ran into a few minor issues with the infrastructure that hopefully can make it into 2015.02.

Frank Hunleth (3):
pkg-rebar: HOST_CC -> HOSTCC
pkg-rebar: add bin to list of install directories
pkg-rebar: fix very minor typos in the comments

 package/pkg-rebar.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--
1.9.1

#1 lore raw

PATCH 1/3 pkg-rebar: HOST_CC -> HOSTCC

Fix HOSTCC typo that would cause host-rebar builds to fail.

---
 package/pkg-rebar.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-rebar.mk +1 -1
index 620316d..57fb2f4 100644
@@ -209,7 +209,7 @@ $(2)_CONF_ENV += $$(REBAR_HOST_DEPS_ENV)
 ifndef $(2)_BUILD_CMDS
 define $(2)_BUILD_CMDS
 	(cd $$(@D); \
-		CC="$$(HOST_CC)" \
+		CC="$$(HOSTCC)" \
 		CFLAGS="$$(HOST_CFLAGS)" \
 		LDFLAGS="$$(HOST_LDFLAGS)" \
 		$$(REBAR_HOST_DEPS_ENV) \
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/3 pkg-rebar: add bin to list of install directories

In reply to Frank Hunleth

Some Erlang packages provide a bin directory for programs that are to be invoked from the command line. An example of such a package is the Lisp Flavored Erlang compiler. The Erlang OTP library includes several more examples (it doesn't use rebar, though.) This change makes sure that the bin directory gets installed too.

---
 package/pkg-rebar.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/pkg-rebar.mk +2 -2
index 57fb2f4..45d1c7d 100644
@@ -43,7 +43,7 @@ REBAR_TARGET_DEPS_ENV = \
 
 # Install an Erlang application from $(@D).
 #
-# i.e., define a recipe that installs the "ebin priv $(2)" directories
+# i.e., define a recipe that installs the "bin ebin priv $(2)" directories
 # from $(@D) to $(1)$($(PKG)_ERLANG_LIBDIR).
 #
 #  argument 1 should typically be $(HOST_DIR), $(TARGET_DIR),
@@ -57,7 +57,7 @@ REBAR_TARGET_DEPS_ENV = \
 #
 define install-erlang-directories
 	$(INSTALL) -d $(1)/$($(PKG)_ERLANG_LIBDIR)
-	for dir in ebin priv $(2); do                                   \
+	for dir in bin ebin priv $(2); do                               \
 		if test -d $(@D)/$$dir; then                            \
 			cp -r $(@D)/$$dir $(1)$($(PKG)_ERLANG_LIBDIR);  \
 		fi;                                                     \
Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/3 pkg-rebar: fix very minor typos in the comments

In reply to Frank Hunleth
---
 package/pkg-rebar.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/pkg-rebar.mk +2 -2
index 45d1c7d..75facd5 100644
@@ -74,7 +74,7 @@ endef
 # For target packages for example, one uses this to setup symbolic
 # links from $(STAGING_DIR)/usr/share/rebar/deps/<erlang-app> to
 # $(STAGING_DIR)/usr/lib/erlang/lib/<erlang-app>-<version>. This
-# infrastructure points rebar at the former in order to tell rebar do
+# infrastructure points rebar at the former in order to tell rebar to
 # NOT download dependencies during the build stage, and instead use
 # the already available dependencies.
 #
@@ -195,7 +195,7 @@ $(2)_DEPENDENCIES ?= $$(filter-out host-automake host-autoconf host-libtool \
 				host-gettext host-toolchain host-erlang-rebar $(1),\
     $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES))))
 else
-# Same deal, if _USE_BUNLDED_REBAR is NO.
+# Same deal, if _USE_BUNDLED_REBAR is NO.
 $(2)_DEPENDENCIES ?= $$(filter-out  host-toolchain host-erlang-rebar $(1),\
 	$$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES))))
 endif
Signature · 1 line
1.9.1
#4 lore raw

cover Minor pkg-rebar updates

In reply to Frank Hunleth
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Frank" == Frank Hunleth <[email protected]> writes:

I've been trying out the new rebar infrastructure with a few Erlang packages. Those packages aren't ready to contribute, but I ran into a few minor issues with the infrastructure that hopefully can make it into 2015.02.

Frank Hunleth (3):
pkg-rebar: HOST_CC -> HOSTCC
pkg-rebar: add bin to list of install directories
pkg-rebar: fix very minor typos in the comments

Committed series, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

cover Minor pkg-rebar updates

Dear Peter Korsgaard,

Quoted 7 lines · Peter Korsgaard
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Frank" == Frank Hunleth <[email protected]> writes:

I've been trying out the new rebar infrastructure with a few Erlang packages. Those packages aren't ready to contribute, but I ran into a few minor issues with the infrastructure that hopefully can make it into 2015.02.

Quoted 6 lines
Quoted 4 lines

Frank Hunleth (3):
pkg-rebar: HOST_CC -> HOSTCC
pkg-rebar: add bin to list of install directories
pkg-rebar: fix very minor typos in the comments

Committed series, thanks.

It seems you only applied the first two patches: the last patch was neither pushed, and was still there in patchwork. So I applied it to master, and pushed.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com