Skip to content

Commit

Permalink
clean up recipe
Browse files Browse the repository at this point in the history
  • Loading branch information
mencian committed Oct 24, 2024
1 parent 1aaee5c commit 25ef0a1
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
3 changes: 3 additions & 0 deletions recipes/augustus/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export LIBPATH="-L${PREFIX}/lib"
export LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
export CXXFLAGS="${CXXFLAGS} -O3 -std=c++14 -DUSE_BOOST -I${PREFIX}/include"

mkdir -p ${PREFIX}/bin
mkdir -p ${PREFIX}/scripts
mkdir -p ${PREFIX}/config

Expand Down Expand Up @@ -53,6 +54,8 @@ cd ..

## End build perl

chmod 0755 bin/augustus
mv bin/* $PREFIX/bin/
mv scripts/* $PREFIX/bin/
mv config/* $PREFIX/config/

Expand Down
5 changes: 3 additions & 2 deletions recipes/augustus/patches/0001-Makefile.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
diff --git a/Makefile b/Makefile
index a26b40c..b061356 100644
index a26b40c..b2ccb6a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,20 +26,26 @@ clean:
cd .. && ./pyclean.sh; \
fi

-PREFIX = /usr/local
-INSTALLDIR = /opt/augustus-$(AUGVERSION)
+# DESTDIR is usually the empty string but can be set for staging
+prefix ?= $(PREFIX)
+bindir = $(DESTDIR)$(prefix)/bin
INSTALLDIR = /opt/augustus-$(AUGVERSION)
+INSTALLDIR = $(prefix)/share/augustus-$(AUGVERSION)

install:
- if [ ! $(PWD) -ef $(INSTALLDIR) ] ; then \
Expand Down
19 changes: 15 additions & 4 deletions recipes/augustus/patches/utrrnaseq.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
--- a/auxprogs/utrrnaseq/Makefile 2022-09-23 10:06:14.000000000 -0700
+++ b/auxprogs/utrrnaseq/Makefile 2022-10-08 10:15:31.359607884 -0700
@@ -29,6 +29,7 @@
diff --git a/auxprogs/utrrnaseq/Makefile b/auxprogs/utrrnaseq/Makefile
index 134c5c5..63fa103 100644
--- a/auxprogs/utrrnaseq/Makefile
+++ b/auxprogs/utrrnaseq/Makefile
@@ -3,7 +3,7 @@
include ../../common.mk

CXX ?= g++
-CXXFLAGS := -Wall -O0 -pedantic -fmessage-length=0 ${CXXFLAGS}
+CXXFLAGS := -Wall -O3 -pedantic -fmessage-length=0 -std=c++14 ${CXXFLAGS}
INCLS += $(INCLUDE_PATH_BOOST) # set boost include path in INCLUDE_PATH_BOOST, if boost is not installed system-wide
LDFLAGS += $(LIBRARY_PATH_BOOST) # set boost library path in LIBRARY_PATH_BOOST, if boost is not installed system-wide

@@ -29,6 +29,7 @@ utrrnaseq: $(OBJS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
@echo 'Finished building target: $@'
@echo ' '
+ cp -f utrrnaseq ../../bin/utrrnaseq

$(OBJS): $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
@echo 'Building file: $<'
@@ -55,5 +56,6 @@
@@ -55,5 +56,6 @@ clean_test:
clean: clean_test
rm -rf $(OBJS) $(DEPS) $(OBJ_DIR) utrrnaseq
@echo ' '
Expand Down

0 comments on commit 25ef0a1

Please sign in to comment.