Skip to content

Commit

Permalink
Update sdm to 3.08 (#52994)
Browse files Browse the repository at this point in the history
* Update sdm to 3.07

* Test without the old patch

* Update sdm to 3.08

* Update Makefile patch

---------

Co-authored-by: Nicola Soranzo <[email protected]>
  • Loading branch information
BiocondaBot and nsoranzo authored Jan 2, 2025
1 parent 40106eb commit 5eb1b61
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 17 deletions.
6 changes: 3 additions & 3 deletions recipes/sdm/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{% set name = "sdm" %}
{% set version = "2.18" %}
{% set version = "3.08" %}

package:
name: {{ name }}
version: {{ version }}

source:
url: https://github.com/hildebra/{{ name }}/archive/v{{ version }}.tar.gz
sha256: 4ae8d1b2be6c3571e9c2db964421e5065255dff209f8e060d43b843be0f04e82
sha256: 122fe90a715c0f8b7cc28e930fe8edd165a0e7d25763d8753a3ae57b8ee58736
patches:
- sdm_1.83.patch
- sdm_3.08.patch

build:
number: 0
Expand Down
25 changes: 11 additions & 14 deletions recipes/sdm/sdm_1.83.patch → recipes/sdm/sdm_3.08.patch
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
diff --git a/Makefile b/Makefile
index df16bce..5967e96 100644
index a22c3ed..53e2310 100644
--- a/Makefile
+++ b/Makefile
@@ -15,13 +15,22 @@ program_INCLUDE_DIRS := ./
program_LIBRARY_DIRS := ${CPATH}
program_LIBRARIES :=
@@ -15,13 +15,19 @@ isa_FLAGS2 :=
#isa_FLAGS := -D_isa1gzip
#isa_FLAGS2 := -lisal

-
-CPPFLAGS += -O3 -std=c++17 -lrt
-CPPFLAGS += -O3 -std=c++17 -lrt $(isa_FLAGS)
+UNAME := $(shell uname)
+CPPFLAGS += -O3 -std=c++17 -pthread
+CPPFLAGS += -O3 -std=c++17 -pthread $(isa_FLAGS)
#-D_isa1gzip
CPPFLAGS += $(foreach includedir,$(program_INCLUDE_DIRS),-I$(includedir))
+ifeq ($(UNAME), Darwin)
+# 'shared_mutex' is available from macOS 10.12
+CPPFLAGS += -mmacosx-version-min=10.12
+endif
CXXFLAGS=-D__STDC_CONSTANT_MACROS
-LDFLAGS += $(foreach librarydir,$(program_LIBRARY_DIRS),-L$(librarydir)) -pthread -Wl,--whole-archive -lpthread -Wl,--no-whole-archive
-LDFLAGS += $(foreach library,$(program_LIBRARIES),-l$(library))
+LDFLAGS += $(foreach librarydir,$(program_LIBRARY_DIRS),-L$(librarydir))
LDFLAGS += $(foreach library,$(program_LIBRARIES),-l$(library))
LDLIBS += -lz
+LDLIBS += $(foreach library,$(program_LIBRARIES),-l$(library))
LDLIBS += -lz $(isa_FLAGS2)
+ifeq ($(UNAME), Linux)
+LDLIBS += -lrt -Wl,--whole-archive -lpthread -Wl,--no-whole-archive
+else
+LDLIBS += -lpthread
+endif
#-lisal

.PHONY: all clean distclean

0 comments on commit 5eb1b61

Please sign in to comment.