Commit edee7d46 authored by Peter Pentchev's avatar Peter Pentchev

Add two patches to be upstreamed.

parent 235d937d
libdebug (0.5.1-2) UNRELEASED; urgency=medium
TODO: a new upstream release with the temp-* patches
* Acknowledge NMU; thanks, Jakub Wilk.
-- Peter Pentchev <roam@ringlet.net> Thu, 21 Jul 2016 22:35:34 +0300
......
temp-env.patch
temp-lib.patch
Description: A temporary patch to make the CC assignment conditional.
Forwarded: yes
Author: Peter Pentchev <roam@ringlet.net>
Last-Update: 2016-07-21
--- a/vars.mk
+++ b/vars.mk
@@ -59,15 +59,17 @@
CFLAGS += -mapcs-32 -march=armv4 -mtune=strongarm1100 -mshort-load-bytes
endif # ifndef CROSS
-CC = $(CROSS)$(COLOR)gcc
+_CC = $(CROSS)$(COLOR)gcc
-ifeq ($(shell which $(CC)),)
-CC = $(CROSS)gcc
-endif # ifeq ($(shell which $(CC)),)
-
-ifeq ($(shell which $(CC)),)
-CC = gcc
-endif # ifeq ($(shell which $(CC)),)
+ifeq ($(shell which $(_CC)),)
+_CC = $(CROSS)gcc
+endif # ifeq ($(shell which $(_CC)),)
+
+ifeq ($(shell which $(_CC)),)
+_CC = gcc
+endif # ifeq ($(shell which $(_CC)),)
+
+CC ?= $(_CC)
ifeq ($(DEBUG),"yes")
CFLAGS += -ggdb
@@ -86,8 +88,8 @@
CFLAGS += -fPIC
endif # ifeq ($(suffix $(LIB)),.so)
-INSTALL = install
+INSTALL ?= install
-AR = $(CROSS)ar
-ARFLAGS = crv
+AR ?= $(CROSS)ar
+ARFLAGS ?= crv
Description: Fix parallel builds by actually defining all the targets!
Forwarded: yes
Author: Peter Pentchev <roam@ringlet.net>
Last-Update: 2016-07-21
--- a/rules.mk
+++ b/rules.mk
@@ -114,8 +114,13 @@
$(LIB):: $(OBJ)
$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,$(LIB_MAJOR) $^ -o $@ $(LDLIBS)
- ln -sf $@ $(LIB_MAJOR)
+
+$(LIB_MAJOR): $(LIB)
+ ln -sf $(LIB) $(LIB_MAJOR)
+
+$(LIB_SO): $(LIB_MAJOR)
ln -sf $(LIB_MAJOR) $(LIB_SO)
+
else # ifneq ($(MAJOR),)
$(LIB):: $(OBJ)
$(CC) $(LDFLAGS) -shared $^ -o $@ $(LDLIBS)
Markdown is supported
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