diff --git a/recipes/alfred/Makefile.patch b/recipes/alfred/Makefile.patch index 484c81138cb53..0ca2a08034fe0 100644 --- a/recipes/alfred/Makefile.patch +++ b/recipes/alfred/Makefile.patch @@ -1,23 +1,29 @@ diff --git a/opt/dev/alfred/Makefile b/Makefile -index e76eead8e..d0866c3e9 100644 +index aaa52e5f7..644ae81f4 100644 --- a/opt/dev/alfred/Makefile +++ b/Makefile -@@ -1,64 +1,21 @@ +@@ -1,66 +1,20 @@ DEBUG ?= 0 STATIC ?= 0 -# Submodules -PWD = $(shell pwd) -EBROOTHTSLIB ?= ${PWD}/src/htslib/ -- ++CXXFLAGS += -isystem ${PREFIX} -isystem ${BOOST_ROOT} -pedantic -W -Wall -Wno-unknown-pragmas -D__STDC_LIMIT_MACROS -fno-strict-aliasing -fpermissive ++LDFLAGS += -L${PREFIX}/lib -lboost_iostreams -lboost_filesystem -lboost_system -lboost_program_options -lboost_date_time ++LDFLAGS += -lhts -lz -llzma -lbz2 ++CXXFLAGS += -O3 -fno-tree-vectorize -DNDEBUG + -# Install dir -prefix = ${PWD} -exec_prefix = $(prefix) -bindir ?= $(exec_prefix)/bin - - # Flags +-# Flags -CXX=g++ --CXXFLAGS += -isystem ${EBROOTHTSLIB} -pedantic -W -Wall -Wno-unknown-pragmas -D__STDC_LIMIT_MACROS -fno-strict-aliasing +-CXXFLAGS = ${CMDCXXFLAGS} +-CXXFLAGS += -isystem ${EBROOTHTSLIB} -pedantic -W -Wall -Wno-unknown-pragmas -D__STDC_LIMIT_MACROS -fno-strict-aliasing -fpermissive +-LDFLAGS = ${CMDLDFLAGS} -LDFLAGS += -L${EBROOTHTSLIB} -L${EBROOTHTSLIB}/lib -lboost_iostreams -lboost_filesystem -lboost_system -lboost_program_options -lboost_date_time - -# Additional flags for release/debug @@ -38,11 +44,7 @@ index e76eead8e..d0866c3e9 100644 - SUBMODULES += .htslib -endif - -+CXXFLAGS += -isystem ${PREFIX} -isystem ${BOOST_ROOT} -pedantic -W -Wall -Wno-unknown-pragmas -D__STDC_LIMIT_MACROS -fno-strict-aliasing -fpermissive -+LDFLAGS += -L${PREFIX}/lib -lboost_iostreams -lboost_filesystem -lboost_system -lboost_program_options -lboost_date_time -+LDFLAGS += -lhts -lz -llzma -lbz2 -+CXXFLAGS += -O3 -fno-tree-vectorize -DNDEBUG - +- -# External sources -HTSLIBSOURCES = $(wildcard src/htslib/*.c) $(wildcard src/htslib/*.h) SOURCES = $(wildcard src/*.h) $(wildcard src/*.cpp) diff --git a/recipes/alfred/meta.yaml b/recipes/alfred/meta.yaml index d029f68ee0eb1..d405ad1c00873 100644 --- a/recipes/alfred/meta.yaml +++ b/recipes/alfred/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "0.1.15" %} -{% set sha256 = "a5a18129019821fac8b346166820d70604190ba36f5a8051f11433de8e9f8478" %} +{% set version = "0.1.16" %} +{% set sha256 = "57950cbcb996db71e5b699f9f55951203888748d920dc2a7d32faa22fd58c554" %} package: name: alfred @@ -8,8 +8,8 @@ package: source: url: https://github.com/tobiasrausch/alfred/archive/v{{ version }}.tar.gz sha256: '{{ sha256 }}' -# patches: -# - Makefile.patch + patches: + - Makefile.patch build: number: 0