Przeglądaj źródła

lua-sha2: clean up makefile

Signed-off-by: Lars Gierth <larsg@systemli.org>
Lars Gierth 10 lat temu
rodzic
commit
2fea5020f6
2 zmienionych plików z 20 dodań i 18 usunięć
  1. 6
    18
      lang/lua-sha2/Makefile
  2. 14
    0
      lang/lua-sha2/patches/001-makefile.patch

+ 6
- 18
lang/lua-sha2/Makefile Wyświetl plik

@@ -35,30 +35,18 @@ define Package/lua-sha2/description
35 35
 	Also contains a HMAC implementation in Lua.
36 36
 endef
37 37
 
38
-define Build/Configure
39
-endef
38
+TARGET_CFLAGS += -fPIC -DSHA2_USE_INTTYPES_H -DBYTE_ORDER -DLITTLE_ENDIAN
39
+TARGET_LDFLAGS += -fPIC -DSHA2_USE_INTTYPES_H -DBYTE_ORDER -DLITTLE_ENDIAN
40 40
 
41
-define Build/Compile
42
-  CC="$(TARGET_CC)" \
43
-  CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include -fPIC -DSHA2_USE_INTTYPES_H -DBYTE_ORDER -DLITTLE_ENDIAN" \
44
-  LIBS="$(TARGET_LIBS)" \
45
-  $(MAKE) -C $(PKG_BUILD_DIR) sha2lib.o sha2.o
41
+define Build/Configure
46 42
 endef
47 43
 
48
-
49 44
 define Package/lua-sha2/install
50
-  CC="$(TARGET_CC)" \
51
-  CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include -fPIC -DSHA2_USE_INTTYPES_H -DBYTE_ORDER -DLITTLE_ENDIAN" \
52
-  LIBS="$(TARGET_LIBS)" \
53
-  LDFLAGS="$(TARGET_LDFLAGS)" \
54
-	$(TARGET_CC) -shared -o $(PKG_BUILD_DIR)/sha2.so \
55
-  $(PKG_BUILD_DIR)/sha2.o $(PKG_BUILD_DIR)/sha2lib.o
56
-
57 45
 	$(INSTALL_DIR) $(1)/usr/lib/lua/hmac
58 46
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/sha2.so $(1)/usr/lib/lua
59
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac.lua	$(1)/usr/lib/lua
60
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac/sha2.lua 	$(1)/usr/lib/lua/hmac
61
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac/md5.lua 	$(1)/usr/lib/lua/hmac
47
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac.lua $(1)/usr/lib/lua
48
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac/sha2.lua $(1)/usr/lib/lua/hmac
49
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac/md5.lua $(1)/usr/lib/lua/hmac
62 50
 endef
63 51
 
64 52
 $(eval $(call BuildPackage,lua-sha2))

+ 14
- 0
lang/lua-sha2/patches/001-makefile.patch Wyświetl plik

@@ -0,0 +1,14 @@
1
+From: Lars Gierth <larsg@systemli.org>
2
+Date: Tue, 2 Sep 2014 00:05:39 +0200
3
+
4
+    Add rump Makefile
5
+
6
+new file mode 100644
7
+index 0000000..f081d38
8
+--- /dev/null
9
++++ b/Makefile
10
+@@ -0,0 +1,4 @@
11
++all: sha2.o sha2lib.o
12
++	$(CC) -shared -o sha2.so sha2.o sha2lib.o
13
++
14
++.PHONY: all