hasufell 14/05/18 17:58:55
Added: flint-2.4.3-libdir.patch
flint-2.4.3-cflags-ldflags.patch
flint-2.4.3-whitespaces.patch
Log:
version bump wrt #507572
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
BDEED020)
Revision Changes Path
1.1 sci-mathematics/flint/files/flint-2.4.3-libdir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/flint/files/flint-2.4.3-libdir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/flint/files/flint-2.4.3-libdir.patch?rev=1.1&content-type=text/plain
Index: flint-2.4.3-libdir.patch
===================================================================
>From 27eb23c1844029ee64907500bd8aa87097ffcd32 Mon Sep 17 00:00:00 2001
From: hasufell <hasuf...@hasufell.de>
Date: Sun, 18 May 2014 18:46:24 +0200
Subject: [PATCH] Allow to control LIBDIR
Some distributions have lib32/lib64 and need to control
the destination properly.
---
Makefile.in | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index c16f838..b6ea4c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,8 @@ else
$(DLPATH):=$(DLPATH_ADD)
endif
+LIBDIR=lib
+
QUIET_CC = @echo ' ' CC ' ' $@;
QUIET_CXX = @echo ' ' CXX ' ' $@;
QUIET_AR = @echo ' ' AR ' ' $@;
@@ -169,13 +171,13 @@ else
endif
install: library
- mkdir -p $(DESTDIR)$(PREFIX)/lib
+ mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
mkdir -p $(DESTDIR)$(PREFIX)/include/flint
$(AT)if [ "$(FLINT_SHARED)" -eq "1" ]; then \
- cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/lib; \
+ cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/$(LIBDIR); \
fi
$(AT)if [ "$(FLINT_STATIC)" -eq "1" ]; then \
- cp libflint.a $(DESTDIR)$(PREFIX)/lib; \
+ cp libflint.a $(DESTDIR)$(PREFIX)/$(LIBDIR); \
fi
cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/flint
$(AT)if [ ! -z $(EXT_HEADERS) ]; then \
--
1.9.3
1.1
sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch?rev=1.1&content-type=text/plain
Index: flint-2.4.3-cflags-ldflags.patch
===================================================================
commit afadc8d05674a0e3e2fcf6dfbcf5f3c8f9133119
Author: hasufell <hasuf...@hasufell.de>
Date: Sun May 18 19:32:59 2014 +0200
Respect CFLAGS/CXXFLAGS/LDFLAGS, fixes #66
Even in linking command CFLAGS should be respected, no matter
if all objects have already been compiled or not. Some flags
affect both linking and object compilation and users shouldn't
be required to figure them out. This is standard in most build
systems anyway.
Reorderd the linker line a bit, so it matches common practice,
although this doesn't matter technically (except that LDFLAGS
must go before libraries we link against).
diff --git a/Makefile.in b/Makefile.in
index a522ac1..6dda689 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,10 +104,10 @@ $(FLINT_LIB): $(LOBJS) $(LIB_SOURCES) $(EXT_SOURCES)
$(HEADERS) $(EXT_HEADERS) |
$(AT)$(foreach dir, $(BUILD_DIRS), mkdir -p build/$(dir);
BUILD_DIR=../build/$(dir); export BUILD_DIR; MOD_DIR=$(dir); export MOD_DIR;
$(MAKE) -f ../Makefile.subdirs -C $(dir) shared || exit $$?;)
$(AT)if [ "$(WANT_NTL)" -eq "1" ]; then \
$(MAKE) build/interfaces/NTL-interface.lo; \
- $(CXX) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS)
build/interfaces/NTL-interface.lo $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) $(LIBS2) -o
$(FLINT_LIB); \
+ $(CXX) $(CXXFLAGS) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS)
build/interfaces/NTL-interface.lo $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) -o
$(FLINT_LIB) $(LDFLAGS) $(LIBS2); \
fi
$(AT)if [ "$(WANT_NTL)" -ne "1" ]; then \
- $(CC) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) $(LOBJS) $(MOD_LOBJS)
$(EXT_OBJS) $(LIBS2) -o $(FLINT_LIB); \
+ $(CC) $(CFLAGS) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) $(LOBJS)
$(MOD_LOBJS) $(EXT_OBJS) -o $(FLINT_LIB) $(LDFLAGS) $(LIBS2); \
fi
libflint.a: $(OBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) |
build build/interfaces
1.1 sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch?rev=1.1&content-type=text/plain
Index: flint-2.4.3-whitespaces.patch
===================================================================
>From 3506d617ef9dfc5184aa99be05a25e4f73d6c3f6 Mon Sep 17 00:00:00 2001
From: hasufell <hasuf...@hasufell.de>
Date: Sun, 18 May 2014 18:47:27 +0200
Subject: [PATCH] Quote variables that could contain whitespaces
Make does NOT take care of this in this context. It's
not a variable assignment and installation would fail
if DESTDIR contains any whitespace.
---
Makefile.in | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index b6ea4c9..a522ac1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -171,23 +171,23 @@ else
endif
install: library
- mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
- mkdir -p $(DESTDIR)$(PREFIX)/include/flint
+ mkdir -p "$(DESTDIR)$(PREFIX)/$(LIBDIR)"
+ mkdir -p "$(DESTDIR)$(PREFIX)/include/flint"
$(AT)if [ "$(FLINT_SHARED)" -eq "1" ]; then \
- cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/$(LIBDIR); \
+ cp $(FLINT_LIB) "$(DESTDIR)$(PREFIX)/$(LIBDIR)"; \
fi
$(AT)if [ "$(FLINT_STATIC)" -eq "1" ]; then \
- cp libflint.a $(DESTDIR)$(PREFIX)/$(LIBDIR); \
+ cp libflint.a "$(DESTDIR)$(PREFIX)/$(LIBDIR)"; \
fi
- cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/flint
+ cp $(HEADERS) "$(DESTDIR)$(PREFIX)/include/flint"
$(AT)if [ ! -z $(EXT_HEADERS) ]; then \
- cp $(EXT_HEADERS) $(DESTDIR)$(PREFIX)/include/flint; \
+ cp $(EXT_HEADERS) "$(DESTDIR)$(PREFIX)/include/flint"; \
fi
- mkdir -p $(DESTDIR)$(FLINT_CPIMPORT_DIR)
- cp qadic/CPimport.txt $(DESTDIR)$(FLINT_CPIMPORT_DIR)
- mkdir -p $(DESTDIR)$(PREFIX)/include/flint/flintxx
- cp flintxx/*.h $(DESTDIR)$(PREFIX)/include/flint/flintxx
- cp *xx.h $(DESTDIR)$(PREFIX)/include/flint
+ mkdir -p "$(DESTDIR)$(FLINT_CPIMPORT_DIR)"
+ cp qadic/CPimport.txt "$(DESTDIR)$(FLINT_CPIMPORT_DIR)"
+ mkdir -p "$(DESTDIR)$(PREFIX)/include/flint/flintxx"
+ cp flintxx/*.h "$(DESTDIR)$(PREFIX)/include/flint/flintxx"
+ cp *xx.h "$(DESTDIR)$(PREFIX)/include/flint"
build:
mkdir -p build
--
1.9.3
