mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: psm2: Correct patch.
* gnu/packages/patches/psm2-compile-ctor-without-avx.patch: Restore the default compilation flags for the "opa/opa_debug.c" file from the package source. Change-Id: Ic1afa49a91d029bcd3bd59f7840b1d428043a7b1 Signed-off-by: Andreas Enge <andreas@enge.fr>
This commit is contained in:
parent
868825bc86
commit
0a76895ad2
1 changed files with 4 additions and 4 deletions
|
@ -4,7 +4,7 @@ Date: 2025-07-25
|
||||||
License: gpl3+
|
License: gpl3+
|
||||||
|
|
||||||
diff --git a/opa/Makefile b/opa/Makefile
|
diff --git a/opa/Makefile b/opa/Makefile
|
||||||
index 2692886..368973b 100644
|
index 2692886..11a92cb 100644
|
||||||
--- a/opa/Makefile
|
--- a/opa/Makefile
|
||||||
+++ b/opa/Makefile
|
+++ b/opa/Makefile
|
||||||
@@ -74,6 +74,7 @@ ${TARGLIB}-objs := opa_debug.o opa_time.o \
|
@@ -74,6 +74,7 @@ ${TARGLIB}-objs := opa_debug.o opa_time.o \
|
||||||
|
@ -15,12 +15,12 @@ index 2692886..368973b 100644
|
||||||
|
|
||||||
.PHONY: all clean
|
.PHONY: all clean
|
||||||
IGNORE_DEP_TARGETS = clean
|
IGNORE_DEP_TARGETS = clean
|
||||||
@@ -84,13 +85,21 @@ install: all
|
@@ -84,12 +85,20 @@ install: all
|
||||||
@echo "Nothing to do for install."
|
@echo "Nothing to do for install."
|
||||||
|
|
||||||
$(OUTDIR)/%.d: $(this_srcdir)/%.c
|
$(OUTDIR)/%.d: $(this_srcdir)/%.c
|
||||||
- $(CC) $(CFLAGS) $(BASECFLAGS) $(INCLUDES) $< -MM -MF $@ -MQ $(@:.d=.o)
|
- $(CC) $(CFLAGS) $(BASECFLAGS) $(INCLUDES) $< -MM -MF $@ -MQ $(@:.d=.o)
|
||||||
+ if [ "$<" = "$(this_srcdir)/opa_debug.c" ] || [ "$<" = "$(this_srcdir)/opa_time.c" ]; then \
|
+ if [ "$<" = "$(this_srcdir)/opa_time.c" ]; then \
|
||||||
+ $(CC) $(CFLAGS) $(BASECFLAGS_NO_AVX) $(INCLUDES) $< -MM -MF $@ -MQ $(@:.d=.o); \
|
+ $(CC) $(CFLAGS) $(BASECFLAGS_NO_AVX) $(INCLUDES) $< -MM -MF $@ -MQ $(@:.d=.o); \
|
||||||
+ else \
|
+ else \
|
||||||
+ $(CC) $(CFLAGS) $(BASECFLAGS) $(INCLUDES) $< -MM -MF $@ -MQ $(@:.d=.o); \
|
+ $(CC) $(CFLAGS) $(BASECFLAGS) $(INCLUDES) $< -MM -MF $@ -MQ $(@:.d=.o); \
|
||||||
|
@ -31,7 +31,7 @@ index 2692886..368973b 100644
|
||||||
|
|
||||||
$(OUTDIR)/%.o: $(this_srcdir)/%.c | ${DEPS}
|
$(OUTDIR)/%.o: $(this_srcdir)/%.c | ${DEPS}
|
||||||
- $(CC) $(CFLAGS) $(BASECFLAGS) $(INCLUDES) -c $< -o $@
|
- $(CC) $(CFLAGS) $(BASECFLAGS) $(INCLUDES) -c $< -o $@
|
||||||
+ if [ "$<" = "$(this_srcdir)/opa_debug.c" ] || [ "$<" = "$(this_srcdir)/opa_time.c" ]; then \
|
+ if [ "$<" = "$(this_srcdir)/opa_time.c" ]; then \
|
||||||
+ $(CC) $(CFLAGS) $(BASECFLAGS_NO_AVX) $(INCLUDES) -c $< -o $@; \
|
+ $(CC) $(CFLAGS) $(BASECFLAGS_NO_AVX) $(INCLUDES) -c $< -o $@; \
|
||||||
+ else \
|
+ else \
|
||||||
+ $(CC) $(CFLAGS) $(BASECFLAGS) $(INCLUDES) -c $< -o $@; \
|
+ $(CC) $(CFLAGS) $(BASECFLAGS) $(INCLUDES) -c $< -o $@; \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue