Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rdeval to 0.0.5 #53619

Merged
merged 2 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions recipes/rdeval/0001-Makefile.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/Makefile b/Makefile
index 1682ec3..d9991ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-CXX ?= g++
-INCLUDE_DIR += -I./include -I./gfalibs/include
+CXX ?= $(CXX)
+INCLUDE_DIR += -I./include -I./gfalibs/include -I$(PREFIX)/include
WARNINGS = -Wall -Wextra

CXXFLAGS = -g -std=gnu++14 -O3 $(INCLUDE_DIR) $(WARNINGS) $(CFLAGS)
@@ -12,7 +12,11 @@ SOURCE = src
INCLUDE = include
BINDIR := $(BUILD)/.o

-LDFLAGS += -pthread
+ifeq ($(origin LDFLAGS), undefined)
+ LDFLAGS := -pthread
+else
+ LDFLAGS := $(LDFLAGS) -pthread
+endif
LIBS = -lz -lcrypto -lhts

OBJS := main input reads
@@ -30,7 +34,7 @@ head: $(BINS) gfalibs | $(BUILD)
all: head validate regenerate

$(BINDIR)%: $(SOURCE)/%.cpp $(INCLUDE)/%.h | $(BINDIR)
- $(CXX) $(CXXFLAGS) $(EVP) -c $(SOURCE)/$(notdir $@).cpp -o $@
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(EVP) -c $(SOURCE)/$(notdir $@).cpp -o $@

.PHONY: gfalibs
gfalibs:
26 changes: 0 additions & 26 deletions recipes/rdeval/Makefile.patch

This file was deleted.

104 changes: 0 additions & 104 deletions recipes/rdeval/build_failure.linux-64.yaml

This file was deleted.

104 changes: 0 additions & 104 deletions recipes/rdeval/build_failure.linux-aarch64.yaml

This file was deleted.

104 changes: 0 additions & 104 deletions recipes/rdeval/build_failure.osx-64.yaml

This file was deleted.

Loading