78 lines
3.1 KiB
Diff
78 lines
3.1 KiB
Diff
In newer binutils, ld options -r and -pie conflict.
|
|
Patch due to Jörg-Volker Peetz
|
|
(source : https://groups.google.com/d/msg/sage-devel/TduebNoZuBE/sEULolL0BQAJ),
|
|
packaged by Emmanuel Charpentier
|
|
|
|
diff -ru flint-2.5.2-orig/fq/Makefile flint-2.5.2-new/fq/Makefile
|
|
--- flint-2.5.2-orig/fq/Makefile 2015-08-13 18:16:22.000000000 +0200
|
|
+++ flint-2.5.2-new/fq/Makefile 2016-11-07 18:41:09.148996528 +0100
|
|
@@ -35,7 +35,7 @@
|
|
$(CC) $(CFLAGS) -c $(INCS) $< -o $@
|
|
|
|
$(MOD_LOBJ): $(LOBJS)
|
|
- $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
|
|
+ $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
|
|
|
|
$(BUILD_DIR)/%.lo: %.c
|
|
$(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
|
|
diff -ru flint-2.5.2-orig/fq_poly/Makefile flint-2.5.2-new/fq_poly/Makefile
|
|
--- flint-2.5.2-orig/fq_poly/Makefile 2015-08-13 18:16:22.000000000 +0200
|
|
+++ flint-2.5.2-new/fq_poly/Makefile 2016-11-07 18:41:09.148996528 +0100
|
|
@@ -35,7 +35,7 @@
|
|
$(CC) $(CFLAGS) -c $(INCS) $< -o $@
|
|
|
|
$(MOD_LOBJ): $(LOBJS)
|
|
- $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
|
|
+ $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
|
|
|
|
$(BUILD_DIR)/%.lo: %.c
|
|
$(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
|
|
diff -ru flint-2.5.2-orig/Makefile.subdirs flint-2.5.2-new/Makefile.subdirs
|
|
--- flint-2.5.2-orig/Makefile.subdirs 2015-08-13 18:16:22.000000000 +0200
|
|
+++ flint-2.5.2-new/Makefile.subdirs 2016-11-07 18:41:09.144996522 +0100
|
|
@@ -59,7 +59,7 @@
|
|
$(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
|
|
|
|
$(MOD_LOBJ): $(LOBJS)
|
|
- $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
|
|
+ $(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
|
|
|
|
-include $(LOBJS:.lo=.d)
|
|
|
|
Seulement dans flint-2.5.2-new/: Makefile.subdirs.orig
|
|
diff -ru flint-2.5.2-orig/padic_mat/Makefile flint-2.5.2-new/padic_mat/Makefile
|
|
--- flint-2.5.2-orig/padic_mat/Makefile 2015-08-13 18:16:22.000000000 +0200
|
|
+++ flint-2.5.2-new/padic_mat/Makefile 2016-11-07 18:41:09.148996528 +0100
|
|
@@ -35,7 +35,7 @@
|
|
$(CC) $(CFLAGS) -c $(INCS) $< -o $@
|
|
|
|
$(MOD_LOBJ): $(LOBJS)
|
|
- $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
|
|
+ $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
|
|
|
|
$(BUILD_DIR)/%.lo: %.c
|
|
$(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
|
|
diff -ru flint-2.5.2-orig/padic_poly/Makefile flint-2.5.2-new/padic_poly/Makefile
|
|
--- flint-2.5.2-orig/padic_poly/Makefile 2015-08-13 18:16:22.000000000 +0200
|
|
+++ flint-2.5.2-new/padic_poly/Makefile 2016-11-07 18:41:09.148996528 +0100
|
|
@@ -35,7 +35,7 @@
|
|
$(CC) $(CFLAGS) -c $(INCS) $< -o $@
|
|
|
|
$(MOD_LOBJ): $(LOBJS)
|
|
- $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
|
|
+ $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
|
|
|
|
$(BUILD_DIR)/%.lo: %.c
|
|
$(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
|
|
diff -ru flint-2.5.2-orig/qadic/Makefile flint-2.5.2-new/qadic/Makefile
|
|
--- flint-2.5.2-orig/qadic/Makefile 2015-08-13 18:16:22.000000000 +0200
|
|
+++ flint-2.5.2-new/qadic/Makefile 2016-11-07 18:41:09.148996528 +0100
|
|
@@ -35,7 +35,7 @@
|
|
$(CC) $(CFLAGS) -c $(INCS) $< -o $@
|
|
|
|
$(MOD_LOBJ): $(LOBJS)
|
|
- $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
|
|
+ $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
|
|
|
|
$(BUILD_DIR)/%.lo: %.c
|
|
$(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
|