main/binutils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The following changes were made to Makefile:

Browse Source 
* Changed to new snap version format
  * set LEXLIB='' during make to prevent binaries from requiring libfl

Also removed unneeded empty file from patch directory
This commit is contained in:
Jay Larson
2017-02-16 10:33:33 -06:00
parent 83cc058d5c
commit 05d1c5660e
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@@ -8,18 +8,19 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
DEPENDS = flex,glibc,zlib DEPENDS = glibc,zlib
ARCH = x86_64 ARCH = x86_64
URL = http://www.gnu.org/software/binutils/ URL = http://www.gnu.org/software/binutils/
BRIEF = Binary tools
DESC = The GNU Binutils are a collection of binary tools. DESC = The GNU Binutils are a collection of binary tools.
SNAPVER = sr3 SNAPVER = 4
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
PATCHDIR := $(PWD)/SRC/patches PATCHDIR := $(PWD)/SRC/patches
BUILDDIR := $(PWD)/BUILD BUILDDIR := $(PWD)/BUILD
VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER) VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
@@ -46,7 +47,7 @@ $(BUILDDIR)/config.log: $(SRCDIR)/configure
@if [ ! -d $(BUILDDIR) ]; then \ @if [ ! -d $(BUILDDIR) ]; then \
mkdir -v $(BUILDDIR); \ mkdir -v $(BUILDDIR); \
fi fi
@cd $(BUILDDIR); \ @cd $(BUILDDIR) && \
../$(SRCDIR)/configure \ ../$(SRCDIR)/configure \
--prefix=/usr \ --prefix=/usr \
--enable-shared \ --enable-shared \
@@ -56,7 +57,8 @@ $(BUILDDIR)/config.log: $(SRCDIR)/configure
--target=x86_64-snap-linux-gnu --target=x86_64-snap-linux-gnu
$(BUILDDIR)/binutils/ar: $(BUILDDIR)/config.log $(BUILDDIR)/binutils/ar: $(BUILDDIR)/config.log
@cd $(BUILDDIR) && make tooldir=/usr @cd $(BUILDDIR) && \
LEXLIB='' make tooldir=/usr
$(ROOT): $(BUILDDIR)/binutils/ar $(ROOT): $(BUILDDIR)/binutils/ar
@if [ -d $(ROOT) ]; then \ @if [ -d $(ROOT) ]; then \
@@ -65,7 +67,8 @@ $(ROOT): $(BUILDDIR)/binutils/ar
mkdir -v $(ROOT); \ mkdir -v $(ROOT); \
fi fi
@cd $(BUILDDIR) && make tooldir=/usr install DESTDIR=$(ROOT) && \ @cd $(BUILDDIR) && \
make tooldir=/usr install DESTDIR=$(ROOT) && \
rm -v $(ROOT)/usr/share/info/dir rm -v $(ROOT)/usr/share/info/dir
test: $(ROOT) test: $(ROOT)

0
SRC/patches/asdf.patch
View File