Commit b8add43e authored by Axel Auweter's avatar Axel Auweter
Browse files

Now with real fix to patch dependencies problem.

parent d9684872
......@@ -95,7 +95,7 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
@echo ""
@echo "Buidling Ncurses library..."
$(eval N := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*ncurses/ncurses/' | sed 's/\ .*//'))
@if [ -e $(DCDBDEPSPATH)/patches/$(N).patch ]; then echo "Patching Ncurses..."; cd $(DCDBDEPSPATH)/$(N) && patch -N -p1 < $(DCDBDEPSPATH)/patches/$(N).patch; fi
@if [ -e $(DCDBDEPSPATH)/patches/$(N).patch ]; then echo "Patching Ncurses..."; cd $(DCDBDEPSPATH)/$(N) && (patch -N -p1 < $(DCDBDEPSPATH)/patches/$(N).patch || true); fi
@cd $(DCDBDEPSPATH)/$(N) && ./configure --prefix=$(DCDBDEPLOYPATH) --with-shared --without-ada --without-manpages \
--without-progs --without-tests && make -j $(MAKETHREADS) && make install
......@@ -115,7 +115,7 @@ $(DCDBDEPSPATH)/.prerequesites: $(DCDBDEPSPATH)/.extract-distfiles
@echo ""
@echo "Buidling Thrift..."
$(eval T := $(shell echo "$(DISTFILESPATHS)" | sed 's/.*thrift/thrift/' | sed 's/\ .*//'))
@if [ -e $(DCDBDEPSPATH)/patches/$(T).patch ]; then echo "Patching Thrift..."; cd $(DCDBDEPSPATH)/$(T) && patch -N -p1 < $(DCDBDEPSPATH)/patches/$(T).patch; fi
@if [ -e $(DCDBDEPSPATH)/patches/$(T).patch ]; then echo "Patching Thrift..."; cd $(DCDBDEPSPATH)/$(T) && (patch -N -p1 < $(DCDBDEPSPATH)/patches/$(T).patch || true); fi
@cd $(DCDBDEPSPATH)/$(T) && env CXXFLAGS="$(CXX11FLAGS)" ./configure --prefix=$(DCDBDEPLOYPATH) --without-qt4 --without-csharp \
--without-java --without-erlang --without-python --without-perl --without-php --without-php_extension \
--without-ruby --without-haskell --without-go --without-d --with-cpp --with-boost=$(DCDBDEPLOYPATH) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment