diff --git a/pkg/relic/Makefile b/pkg/relic/Makefile index 26e4406b43..3497d89bfc 100644 --- a/pkg/relic/Makefile +++ b/pkg/relic/Makefile @@ -1,39 +1,28 @@ -RELIC_URL=http://github.com/relic-toolkit/relic.git -RELIC_BRANCH=cdcfaeef101d18c3231c3b46359c519dd72682e8 - PKG_NAME=relic -PKG_URL=$(RELIC_URL) -PKG_VERSION=$(RELIC_BRANCH) -PKG_DIR=$(CURDIR)/$(PKG_NAME) +PKG_URL=http://github.com/relic-toolkit/relic.git +PKG_VERSION=cdcfaeef101d18c3231c3b46359c519dd72682e8 ifneq ($(RIOTBASE),) INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \ -I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include endif -.PHONY: all clean reset +.PHONY: all -all: $(PKG_DIR)/Makefile - "$(MAKE)" -C $(PKG_DIR) && \ - cp $(PKG_DIR)/lib/librelic_s.a $(BINDIR)$(PKG_NAME).a +all: $(PKG_BUILDDIR)/Makefile + "$(MAKE)" -C $(PKG_BUILDDIR) && \ + cp $(PKG_BUILDDIR)/lib/librelic_s.a $(BINDIR)$(PKG_NAME).a -$(PKG_DIR)/comp-options.cmake: $(PKG_DIR)/.git/config - cd "$(PKG_DIR)" && perl ../generate-cmake-xcompile.perl > comp-options.cmake +$(PKG_BUILDDIR)/comp-options.cmake: fix_source + cd "$(PKG_BUILDDIR)" && perl $(PKG_DIR)/generate-cmake-xcompile.perl > comp-options.cmake -$(PKG_DIR)/Makefile: $(PKG_DIR)/comp-options.cmake - cd "$(PKG_DIR)" && COMP="$(filter-out -Werror=old-style-definition -Werror=strict-prototypes, $(CFLAGS) ) " cmake -DCMAKE_TOOLCHAIN_FILE=comp-options.cmake -DCHECK=off -DTESTS=0 -DBENCH=0 -DSHLIB=off -Wno-dev $(RELIC_CONFIG_FLAGS) . -$(PKG_DIR)/.git/config: - test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)" - cd "$(PKG_DIR)" && git am --ignore-whitespace $(CURDIR)/*.patch - ./fix-util_print_wo_args.sh . - ./fix-old-style-definitions.sh . +$(PKG_BUILDDIR)/Makefile: $(PKG_BUILDDIR)/comp-options.cmake + cd "$(PKG_BUILDDIR)" && COMP="$(filter-out -Werror=old-style-definition -Werror=strict-prototypes, $(CFLAGS) ) " cmake -DCMAKE_TOOLCHAIN_FILE=comp-options.cmake -DCHECK=off -DTESTS=0 -DBENCH=0 -DSHLIB=off -Wno-dev $(RELIC_CONFIG_FLAGS) . + +fix_source: download + ./fix-util_print_wo_args.sh $(PKG_BUILDDIR) + ./fix-old-style-definitions.sh $(PKG_BUILDDIR) clean:: - @echo "Cleaning up relic package..." - rm -rf "$(PKG_DIR)" - -distclean:: - rm -rf "$(PKG_DIR)" - -Makefile.include: - @true + @rm -rf $(BINDIR)$(PKG_NAME).a +include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/relic/Makefile.include b/pkg/relic/Makefile.include index c9c20ba248..9cd7350a59 100644 --- a/pkg/relic/Makefile.include +++ b/pkg/relic/Makefile.include @@ -1 +1 @@ -INCLUDES += -I$(RIOTPKG)/relic/relic/include +INCLUDES += -I$(BINDIR)/pkg/relic/include