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.

Sign up for GitHub

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

alfred v0.1.16 #12240

Merged
merged 3 commits into from
Nov 19, 2018
Merged

alfred v0.1.16 #12240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0da2cb8
alfred v0.1.16
tobiasrausch Nov 19, 2018
afb4be4
makefile patch
tobiasrausch Nov 19, 2018
1abab33
makefile patch
tobiasrausch Nov 19, 2018
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
22 changes: 12 additions & 10 deletions recipes/alfred/Makefile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions recipes/alfred/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set version = "0.1.15" %}
{% set sha256 = "a5a18129019821fac8b346166820d70604190ba36f5a8051f11433de8e9f8478" %}
{% set version = "0.1.16" %}
{% set sha256 = "57950cbcb996db71e5b699f9f55951203888748d920dc2a7d32faa22fd58c554" %}

package:
name: alfred
Expand All @@ -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
Expand Down