From a605362cab90bdc81604fee1cbcbfbfe7849935d Mon Sep 17 00:00:00 2001 From: fatbob313 Date: Sun, 14 Feb 2010 21:48:09 +0000 Subject: [PATCH] Makefiles for both OpenSSL and PolarSSL support --- openwrt/{Makefile => Makefile.openssl} | 19 ++++----- openwrt/Makefile.polarssl | 56 ++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 9 deletions(-) rename openwrt/{Makefile => Makefile.openssl} (65%) create mode 100644 openwrt/Makefile.polarssl diff --git a/openwrt/Makefile b/openwrt/Makefile.openssl similarity index 65% rename from openwrt/Makefile rename to openwrt/Makefile.openssl index 9cabe7e..f989ee7 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile.openssl @@ -1,6 +1,6 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=umurmur_12x +PKG_NAME:=umurmur-openssl PKG_VERSION:=0.2.0 PKG_RELEASE:=1 @@ -9,17 +9,18 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk -define Package/umurmur_12x +define Package/umurmur-openssl SECTION:=net CATEGORY:=Network - TITLE:=uMurmur_12x + TITLE:=uMurmur DEPENDS:=+libopenssl +libconfig URL:=http://code.google.com/p/umurmur MAINTAINER:=Martin Johansson endef -define Package/umurmur_12x/description +define Package/umurmur-openssl/description Minimalistic Mumble server daemon. + Uses OpenSSL library for SSL and crypto. endef TARGET_CFLAGS := \ @@ -33,19 +34,19 @@ endef define Build/CompileTarget CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"\ - $(MAKE) -C $(PKG_BUILD_DIR)/umurmur_12x.$(1)/umurmur_12x \ + $(MAKE) -C $(PKG_BUILD_DIR)/umurmur.$(1)/umurmur \ all endef -define Package/umurmur_12x/install +define Package/umurmur-openssl/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/umurmur_12x $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/umurmurd $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc $(INSTALL_CONF) ./files/umurmur.conf $(1)/etc/ $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/umurmur.init $(1)/etc/init.d/umurmur_12x + $(INSTALL_BIN) ./files/umurmur.init $(1)/etc/init.d/umurmur $(INSTALL_DIR) $(1)/etc/umurmur endef -$(eval $(call BuildPackage,umurmur_12x)) +$(eval $(call BuildPackage,umurmur-openssl)) diff --git a/openwrt/Makefile.polarssl b/openwrt/Makefile.polarssl new file mode 100644 index 0000000..ea2b48b --- /dev/null +++ b/openwrt/Makefile.polarssl @@ -0,0 +1,56 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=umurmur-polarssl +PKG_VERSION:=0.2.0 +PKG_RELEASE:=1 + +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) + +include $(INCLUDE_DIR)/package.mk + + +define Package/umurmur-polarssl + SECTION:=net + CATEGORY:=Network + TITLE:=uMurmur + DEPENDS:=+libpolarssl +libconfig + URL:=http://code.google.com/p/umurmur + MAINTAINER:=Martin Johansson +endef + +define Package/umurmur-polarssl/description + Minimalistic Mumble server daemon. + Uses the PolarSSL library for SSL and crypto. +endef + +TARGET_CFLAGS := \ + -DWRT_TARGET \ + -DUSE_POLARSSL \ + $(TARGET_CFLAGS) +TARGET_LDFLAGS := \ + -lpolarssl \ + $(TARGET_LDFLAGS) + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(CP) ./src/* $(PKG_BUILD_DIR)/ +endef + +define Build/CompileTarget + CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"\ + $(MAKE) -C $(PKG_BUILD_DIR)/umurmur.$(1)/umurmur \ + all +endef + +define Package/umurmur-polarssl/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/umurmurd $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_CONF) ./files/umurmur.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/umurmur.init $(1)/etc/init.d/umurmur + $(INSTALL_DIR) $(1)/etc/umurmur +endef + +$(eval $(call BuildPackage,umurmur-polarssl)) + -- 2.30.2