Updates to latest release and lets us drop a local patch to fix the
.pc file.
ok?
-----------------------------------------------
commit 4d05f8932bbac940cd5ebd42b0bcfbe3936259ee (flint_3.1.2)
from: Josh Rickmar <jr...@zettaport.com>
date: Mon Apr 1 16:07:05 2024 UTC
Update math/flintlib to 3.1.2
diff ea4f9dd253a362877e4c6058de04dbefc2206751
4d05f8932bbac940cd5ebd42b0bcfbe3936259ee
commit - ea4f9dd253a362877e4c6058de04dbefc2206751
commit + 4d05f8932bbac940cd5ebd42b0bcfbe3936259ee
blob - 4756265fba1a3c3cde91d3aa6ef76f33bf25702b
blob + 5590a52d8c4ab6429fec5a0805aacfcdae42c230
--- math/flintlib/Makefile
+++ math/flintlib/Makefile
@@ -2,17 +2,17 @@ COMMENT = fast library for number theory
DPB_PROPERTIES = parallel
-V = 3.0.1
+V = 3.1.2
PKGNAME = flintlib-${V}
DISTNAME = flint-${V}
-SHARED_LIBS = flint 0.0 # 18.0.1
+SHARED_LIBS = flint 1.0 # 19.0.0
CATEGORIES = math
HOMEPAGE = https://flintlib.org/
MAINTAINER = Josh Rickmar <jr...@openbsd.org>
-# LGPLv2
+# LGPLv3
PERMIT_PACKAGE = Yes
WANTLIB = m pthread gmp mpfr
blob - 73c2a747dead49117fb57144f013a444ef27b831
blob + a725f08337fb34d10c1d2a786a247e3b954ef4a0
--- math/flintlib/distinfo
+++ math/flintlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flint-3.0.1.tar.gz) = ezEaAFA6hjiB64F32+uEMi8pOZ89fXLzsaTJuh1XlLQ=
-SIZE (flint-3.0.1.tar.gz) = 8162288
+SHA256 (flint-3.1.2.tar.gz) = /bOkMaN0ZINKz/O9wUX0/o0PlR3VMnxMb5P0y6xcJwA=
+SIZE (flint-3.1.2.tar.gz) = 8098136
blob - 79be49229c55fa8ae335b3ae269545e58a19d987
blob + 4cea7442ad09c81f7b3a7762a0e43261deb2419b
--- math/flintlib/patches/patch-Makefile_in
+++ math/flintlib/patches/patch-Makefile_in
@@ -1,159 +1,186 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -87,7 +87,7 @@ LIBS2:=-lflint $(LIBS)
- PIC_FLAG:=@PIC_FLAG@
+@@ -104,7 +104,7 @@ arith_CFLAGS:=-funroll-loops
+ endif
LDFLAGS:=@LDFLAGS@
--EXTRA_SHARED_FLAGS:=@EXTRA_SHARED_FLAGS@ $(foreach path, $(GMP_LIB_PATH)
$(MPFR_LIB_PATH) $(BLAS_LIB_PATH) $(GC_LIB_PATH) $(NTL_LIB_PATH),
@WL@-rpath,$(path))
-+EXTRA_SHARED_FLAGS:=-Wl,-soname,$(FLINT_LIB_FULL) $(foreach path,
$(GMP_LIB_PATH) $(MPFR_LIB_PATH) $(BLAS_LIB_PATH) $(GC_LIB_PATH)
$(NTL_LIB_PATH), @WL@-rpath,$(path))
- EXE_LDFLAGS:=$(LDFLAGS) $(foreach path, $(ABS_FLINT_DIR) $(GMP_LIB_PATH)
$(MPFR_LIB_PATH) $(BLAS_LIB_PATH) $(GC_LIB_PATH) $(NTL_LIB_PATH),
@WL@-rpath,$(path))
+-EXTRA_SHARED_FLAGS:=@EXTRA_SHARED_FLAGS@ $(foreach path, $(sort
$(GMP_LIB_PATH) $(MPFR_LIB_PATH) $(BLAS_LIB_PATH) $(GC_LIB_PATH)
$(NTL_LIB_PATH)), @WL@-rpath,$(path))
++EXTRA_SHARED_FLAGS:=-Wl,-soname,$(FLINT_LIB_FULL) $(foreach path, $(sort
$(GMP_LIB_PATH) $(MPFR_LIB_PATH) $(BLAS_LIB_PATH) $(GC_LIB_PATH)
$(NTL_LIB_PATH)), @WL@-rpath,$(path))
+ EXE_LDFLAGS:=$(LDFLAGS) $(foreach path, $(sort $(ABS_FLINT_DIR)
$(GMP_LIB_PATH) $(MPFR_LIB_PATH) $(BLAS_LIB_PATH) $(GC_LIB_PATH)
$(NTL_LIB_PATH)), @WL@-rpath,$(path))
-
################################################################################
-@@ -370,7 +370,7 @@ MERGED_LOBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(di
+ # Obtain level of parallel
+@@ -427,11 +427,11 @@ MERGED_LOBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(di
+
$(FLINT_DIR)/$(FLINT_LIB_FULL): $(MERGED_LOBJS)
- $(CC) $(CFLAGS) -shared $(EXTRA_SHARED_FLAGS) $(MERGED_LOBJS) -o
$(FLINT_LIB_FULL) $(LDFLAGS) $(LIBS)
- ifneq ($(FLINT_SOLIB), 0)
-- $(LDCONFIG) -n .
-+# $(LDCONFIG) -n .
+ @echo "Building $(FLINT_LIB_FULL)"
+- @$(CC) $(CFLAGS) -shared $(EXTRA_SHARED_FLAGS) $(MERGED_LOBJS) -o
$(FLINT_LIB_FULL) $(LDFLAGS) $(LIBS)
+- @$(RM_F) $(FLINT_LIB)
+- @$(RM_F) $(FLINT_LIB_MAJOR)
+- @$(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB)
+- @$(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB_MAJOR)
++ $(CC) $(CFLAGS) -shared $(EXTRA_SHARED_FLAGS) $(MERGED_LOBJS) -o
$(FLINT_LIB_FULL) $(LDFLAGS) $(LIBS)
++ $(RM_F) $(FLINT_LIB)
++ $(RM_F) $(FLINT_LIB_MAJOR)
++ $(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB)
++ $(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB_MAJOR)
endif
- $(RM_F) $(FLINT_LIB)
- $(RM_F) $(FLINT_LIB_MAJOR)
-@@ -511,8 +511,7 @@ endif
+
ifneq ($(STATIC), 0)
+@@ -582,14 +582,12 @@ endif
+ ifneq ($(STATIC), 0)
define xxx_OBJS_rule
$(BUILD_DIR)/$(1)/%.o: $(SRC_DIR)/$(1)/%.c | $(BUILD_DIR)/$(1)
-- @echo " CC $$(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -c $$< -o $$@ -MMD -MF
$$(@:%=%.d)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -c $$< -o $$@ -MMD -MF
$$(@:%=%.d)
+- @echo " CC $$(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(CFLAGS) $($(1)_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -c $$< -o
$$@ $$(DEPFLAGS)
++ $(CC) $(CFLAGS) $($(1)_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -c $$< -o
$$@ $$(DEPFLAGS)
endef
+ ifeq ($(WANT_ADX_ASSEMBLY),1)
+ %.o: %.s
+- @echo " CC $(<:$(BUILD_DIR)/%.s=%.asm)"
+- @$(CC) $(ASM_OBJ_FLAGS) -c $< -o $@
++ $(CC) $(ASM_OBJ_FLAGS) -c $< -o $@
+ endif
+
$(foreach dir, $(DIRS), $(eval $(call xxx_OBJS_rule,$(dir))))
-@@ -525,8 +524,7 @@ endif
+@@ -602,14 +600,12 @@ endif
ifneq ($(SHARED), 0)
define xxx_LOBJS_rule
$(BUILD_DIR)/$(1)/%.lo: $(SRC_DIR)/$(1)/%.c | $(BUILD_DIR)/$(1)
-- @echo " CC $$(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(PIC_FLAG) $(CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -c $$< -o $$@
-MMD -MF $$(@:%=%.d)
-+ $(CC) $(PIC_FLAG) $(CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -c $$< -o $$@
-MMD -MF $$(@:%=%.d)
+- @echo " CC $$(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(PIC_FLAG) $(CFLAGS) $($(1)_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS)
-c $$< -o $$@ $$(DEPFLAGS)
++ $(CC) $(PIC_FLAG) $(CFLAGS) $($(1)_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS)
-c $$< -o $$@ $$(DEPFLAGS)
endef
+ ifeq ($(WANT_ADX_ASSEMBLY),1)
+ %.lo: %_pic.s
+- @echo " CC $(<:$(BUILD_DIR)/%.s=%.asm)"
+- @$(CC) $(ASM_LOBJ_FLAGS) -c $< -o $@
++ $(CC) $(ASM_LOBJ_FLAGS) -c $< -o $@
+ endif
+
$(foreach dir, $(DIRS), $(eval $(call xxx_LOBJS_rule,$(dir))))
-@@ -538,25 +536,21 @@ endif
+@@ -621,25 +617,21 @@ endif
ifeq ($(SHARED), 0)
$(BUILD_DIR)/profile/%$(EXEEXT): $(SRC_DIR)/profile/%.c
$(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/profile
-- @echo " CC $(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
+- @echo " CC $(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
else
$(BUILD_DIR)/profile/%$(EXEEXT): $(SRC_DIR)/profile/%.c |
$(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/profile
-- @echo " CC $(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
+- @echo " CC $(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
endif
ifeq ($(SHARED), 0)
define xxx_PROFS_rule
$(BUILD_DIR)/$(1)/profile/%$(EXEEXT): $(SRC_DIR)/$(1)/profile/%.c
$(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/$(1)/profile
-- @echo " CC $$(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
+- @echo " CC $$(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
endef
else
define xxx_PROFS_rule
$(BUILD_DIR)/$(1)/profile/%$(EXEEXT): $(SRC_DIR)/$(1)/profile/%.c |
$(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/$(1)/profile
-- @echo " CC $$(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
+- @echo " CC $$(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
endef
endif
-@@ -564,25 +558,21 @@ $(foreach dir, $(DIRS), $(eval $(call xxx_PROFS_rule,$
+@@ -647,25 +639,21 @@ $(foreach dir, $(DIRS), $(eval $(call xxx_PROFS_rule,$
ifeq ($(SHARED), 0)
$(BUILD_DIR)/test/%$(EXEEXT): $(SRC_DIR)/test/%.c
$(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/test
-- @echo " CC $(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
+- @echo " CC $(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
else
$(BUILD_DIR)/test/%$(EXEEXT): $(SRC_DIR)/test/%.c |
$(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/test
-- @echo " CC $(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
+- @echo " CC $(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
endif
ifeq ($(SHARED), 0)
define xxx_TESTS_rule
$(BUILD_DIR)/$(1)/test/%$(EXEEXT): $(SRC_DIR)/$(1)/test/%.c
$(FLINT_DIR)/libflint.a | $(BUILD_DIR)/$(1)/test
-- @echo " CC $$(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
+- @echo " CC $$(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
endef
else
define xxx_TESTS_rule
$(BUILD_DIR)/$(1)/test/%$(EXEEXT): $(SRC_DIR)/$(1)/test/%.c |
$(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/$(1)/test
-- @echo " CC $$(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
+- @echo " CC $$(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
endef
endif
-@@ -591,36 +581,30 @@ $(foreach dir, $(DIRS), $(eval $(call xxx_TESTS_rule,$
+@@ -674,36 +662,30 @@ $(foreach dir, $(DIRS), $(eval $(call xxx_TESTS_rule,$
ifneq ($(WANT_NTL), 0)
ifeq ($(SHARED), 0)
$(BUILD_DIR)/interfaces/test/t-NTL-interface$(EXEEXT):
$(SRC_DIR)/interfaces/test/t-NTL-interface.cpp $(FLINT_DIR)/$(FLINT_LIB_STATIC)
| $(BUILD_DIR)/interfaces/test
-- @echo " CXX $(@:$(BUILD_DIR)/%=%)"
-- @$(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
-+ $(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
+- @echo " CXX $(<:$(SRC_DIR)/%=%)"
+- @$(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
else
$(BUILD_DIR)/interfaces/test/t-NTL-interface$(EXEEXT):
$(SRC_DIR)/interfaces/test/t-NTL-interface.cpp | $(FLINT_DIR)/$(FLINT_LIB_FULL)
$(BUILD_DIR)/interfaces/test
-- @echo " CXX $(@:$(BUILD_DIR)/%=%)"
-- @$(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
-+ $(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
+- @echo " CXX $(<:$(SRC_DIR)/%=%)"
+- @$(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
endif
endif
ifeq ($(SHARED), 0)
$(BUILD_DIR)/tune/%$(EXEEXT): $(SRC_DIR)/tune/%.c
$(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/tune
-- @echo " CC $(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
+- @echo " CC $(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
else
$(BUILD_DIR)/tune/%$(EXEEXT): $(SRC_DIR)/tune/%.c |
$(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/tune
-- @echo " CC $(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
+- @echo " CC $(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
endif
ifeq ($(SHARED), 0)
define xxx_TUNES_rule
$(BUILD_DIR)/$(1)/tune/%$(EXEEXT): $(SRC_DIR)/$(1)/tune/%.c
$(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/$(1)/tune
-- @echo " CC $$(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
+- @echo " CC $$(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
endef
else
define xxx_TUNES_rule
$(BUILD_DIR)/$(1)/tune/%$(EXEEXT): $(SRC_DIR)/$(1)/tune/%.c |
$(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/$(1)/tune
-- @echo " CC $$(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
-MMD -MF $$(@:%=%.d)
+- @echo " CC $$(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2)
$$(DEPFLAGS)
endef
endif
-@@ -628,12 +612,10 @@ $(foreach dir, $(DIRS), $(eval $(call xxx_TUNES_rule,$
+@@ -711,12 +693,10 @@ $(foreach dir, $(DIRS), $(eval $(call xxx_TUNES_rule,$
ifeq ($(SHARED), 0)
$(BUILD_DIR)/examples/%$(EXEEXT): $(FLINT_DIR)/examples/%.c
$(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/examples
-- @echo " CC $(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
+- @echo " CC $(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
else
$(BUILD_DIR)/examples/%$(EXEEXT): $(FLINT_DIR)/examples/%.c |
$(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/examples
-- @echo " CC $(@:$(BUILD_DIR)/%=%)"
-- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
-+ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) -MMD
-MF $(@:%=%.d)
+- @echo " CC $(<:$(SRC_DIR)/%=%)"
+- @$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
++ $(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2)
$(DEPFLAGS)
endif
################################################################################
+@@ -966,4 +946,3 @@ print-%:
+ @echo "$*=$($*)"
+
+ .PHONY: all library shared static examples checkexamples profile tests check
tune valgrind clean distclean install uninstall dist %_TEST_RUN %_VALGRIND_RUN
print-% coverage coverage_html
+-.SILENT: $(mpn_extras_S_SOURCES)
blob - 6cba567201784f91222ba52d5bd10734bc95b3af (mode 644)
blob + /dev/null
--- math/flintlib/patches/patch-flint_pc_in
+++ /dev/null
@@ -1,12 +0,0 @@
-Patch submitted to upstream:
-https://github.com/flintlib/flint/pull/1647
-
-Index: flint.pc.in
---- flint.pc.in.orig
-+++ flint.pc.in
-@@ -8,4 +8,4 @@ Description: Fast Library for Number Theory
- Version: @PACKAGE_VERSION@
- URL: https://flintlib.org/
- Cflags: -I${includedir}
--Libs: -L${libdir} -lgmp -lmpfr
-+Libs: -L${libdir} -lflint -lgmp -lmpfr
blob - 451e6960490ccfb26abc2c918cd06d42cc6540e2
blob + 96599c086f25e86fe172ac30f43c0ebfba8e7b5c
--- math/flintlib/pkg/PLIST
+++ math/flintlib/pkg/PLIST
@@ -9,6 +9,7 @@ include/flint/acb_hypgeom.h
include/flint/acb_mat.h
include/flint/acb_modular.h
include/flint/acb_poly.h
+include/flint/acb_theta.h
include/flint/acb_types.h
include/flint/acf.h
include/flint/acf_types.h
@@ -40,7 +41,6 @@ include/flint/dirichlet.h
include/flint/dlog.h
include/flint/double_extras.h
include/flint/double_interval.h
-include/flint/exception.h
include/flint/fexpr.h
include/flint/fexpr_builtin.h
include/flint/fft.h
@@ -120,21 +120,25 @@ include/flint/gr_mpoly.h
include/flint/gr_poly.h
include/flint/gr_special.h
include/flint/gr_vec.h
-include/flint/hashmap.h
include/flint/hypgeom.h
include/flint/limb_types.h
include/flint/long_extras.h
include/flint/longlong.h
+include/flint/longlong_asm_clang.h
+include/flint/longlong_asm_gcc.h
+include/flint/longlong_div_gnu.h
+include/flint/longlong_msc_arm64.h
+include/flint/longlong_msc_x86.h
include/flint/machine_vectors.h
include/flint/mag.h
-include/flint/mpf_mat.h
-include/flint/mpf_vec.h
+include/flint/mpf-impl.h
include/flint/mpfr_mat.h
include/flint/mpfr_vec.h
include/flint/mpn_extras.h
include/flint/mpoly.h
include/flint/mpoly_types.h
include/flint/n_poly.h
+include/flint/n_poly_types.h
include/flint/nf.h
include/flint/nf_elem.h
include/flint/nmod.h
@@ -149,6 +153,7 @@ include/flint/nmod_vec.h
include/flint/padic.h
include/flint/padic_mat.h
include/flint/padic_poly.h
+include/flint/padic_types.h
include/flint/partitions.h
include/flint/perm.h
include/flint/profiler.h
@@ -162,7 +167,7 @@ include/flint/thread_support.h
include/flint/ulong_extras.h
@comment @so lib/libflint.so
@lib lib/libflint.so.${LIBflint_VERSION}
-@comment lib/libflint.so.18
+@comment lib/libflint.so.19
lib/pkgconfig/flint.pc
share/doc/flint/
share/doc/flint/README.md
