Update to latest mercurial snapshot.
Also, drop the python2 subpackage; upstream moved python support to a separate project.
This commit is contained in:
parent
47405056db
commit
744413fb3a
5 changed files with 45 additions and 101 deletions
|
|
@ -1,24 +1,24 @@
|
|||
--- ./Makefile.orig 2015-03-07 17:10:40.822991023 -0700
|
||||
+++ ./Makefile 2015-03-07 17:12:53.760275780 -0700
|
||||
--- Makefile.orig 2016-02-05 14:41:31.862198725 -0700
|
||||
+++ Makefile 2016-02-04 21:46:14.618379630 -0700
|
||||
@@ -46,7 +46,7 @@ ARCHFLAGS := $(ARCHFLAGS)
|
||||
|
||||
OPTFLAGS ?= -g -O #-DABC_NAMESPACE=xxx
|
||||
OPTFLAGS ?= -g -O
|
||||
|
||||
-CFLAGS += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(OPTFLAGS) $(ARCHFLAGS) -Isrc
|
||||
-CFLAGS += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(ARCHFLAGS)
|
||||
+CFLAGS += -Wno-unused-function $(OPTFLAGS) $(ARCHFLAGS) -Isrc
|
||||
ifneq ($(findstring arm,$(shell uname -m)),)
|
||||
CFLAGS += -DABC_MEMALIGN=4
|
||||
endif
|
||||
@@ -148,6 +148,12 @@ $(PROG): $(OBJ)
|
||||
@@ -186,6 +186,12 @@ $(PROG): $(OBJ)
|
||||
@echo "$(MSG_PREFIX)\`\` Building binary:" $(notdir $@)
|
||||
@$(LD) -o $@ $^ $(LIBS)
|
||||
$(VERBOSE)$(LD) -o $@ $^ $(LIBS)
|
||||
|
||||
+lib$(PROG).so: $(OBJ)
|
||||
+ @echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
|
||||
+ $(LD) -shared -Wl,-h,lib$(PROG).so.0 -o lib$(PROG).so.0.0.0 $^ $(LIBS)
|
||||
+ @ln -s lib$(PROG).so.0.0.0 lib$(PROG).so.0
|
||||
+ @ln -s lib$(PROG).so.0 $@
|
||||
+ $(VERBOSE)$(LD) -shared -Wl,-h,lib$(PROG).so.0 -o lib$(PROG).so.0.0.0 $^ $(LIBS)
|
||||
+ $(VERBOSE)ln -s lib$(PROG).so.0.0.0 lib$(PROG).so.0
|
||||
+ $(VERBOSE)ln -s lib$(PROG).so.0 $@
|
||||
+
|
||||
lib$(PROG).a: $(OBJ)
|
||||
@echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
|
||||
@ar rv $@ $?
|
||||
$(VERBOSE)ar rv $@ $?
|
||||
|
|
|
|||
Reference in a new issue