Ver código fonte

gammu: use cmake.mk

- remove not needed legacy stuff
- fix lib64 suffix when installing
fixes build error when target is x86_64

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Dirk Neukirchen 10 anos atrás
pai
commit
5819a55155
1 arquivos alterados com 6 adições e 21 exclusões
  1. 6
    21
      utils/gammu/Makefile

+ 6
- 21
utils/gammu/Makefile Ver arquivo

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
10 10
 
11 11
 PKG_NAME:=gammu
12 12
 PKG_VERSION:=1.34.0
13
-PKG_RELEASE:=1
13
+PKG_RELEASE:=2
14 14
 
15 15
 PKG_SOURCE_URL:=http://dl.cihar.com/gammu/releases/
16 16
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -18,8 +18,11 @@ PKG_MD5SUM:=5bc2508389d9b291ca0b8d4f210d0012
18 18
 PKG_MAINTAINER:=Vitaly Protsko <villy@sft.ru>
19 19
 PKG_LICENCE:=GPL-2.0
20 20
 
21
+PKG_INSTALL:=1
22
+
21 23
 include $(INCLUDE_DIR)/package.mk
22 24
 include $(INCLUDE_DIR)/nls.mk
25
+include $(INCLUDE_DIR)/cmake.mk
23 26
 
24 27
 define Package/gammu
25 28
 	SECTION:=utils
@@ -32,30 +35,12 @@ define Package/gammu
32 35
 	DEPENDS+=+PACKAGE_libusb-1.0:libusb-1.0
33 36
 endef
34 37
 
35
-CONFIGURE_ARGS:= \
36
-	--prefix=/usr \
37
-	--cross-root="$(STAGING_DIR) $(TOOLCHAIN_DIR)" \
38
-	--enable-shared \
39
-	--without-libdbi
40
-
41
-define Build/Compile
42
-	$(MAKE) -C $(PKG_BUILD_DIR) \
43
-		$(TARGET_CONFIGURE_OPTS) \
44
-		LDSHARED="$(TARGET_CROSS)ld -shared" \
45
-		CFLAGS="$(TARGET_CFLAGS) $(FPIC)"
46
-endef
47
-
48
-define Build/Install
49
-	$(MAKE) -C $(PKG_BUILD_DIR) \
50
-		DESTDIR="$(PKG_INSTALL_DIR)" \
51
-		install
52
-endef
53 38
 
54 39
 define Build/InstallDev
55 40
 	mkdir -p $(1)/usr/include
56 41
 	$(CP) -r $(PKG_INSTALL_DIR)/usr/include/gammu $(1)/usr/include/
57 42
 	mkdir -p $(1)/usr/lib
58
-	$(CP)    $(PKG_INSTALL_DIR)/usr/lib/lib{Gammu*,gsmsd*} $(1)/usr/lib/
43
+	$(CP)    $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/lib{Gammu*,gsmsd*} $(1)/usr/lib/
59 44
 endef
60 45
 
61 46
 define Package/gammu/install
@@ -63,7 +48,7 @@ define Package/gammu/install
63 48
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gammu $(1)/usr/bin
64 49
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gammu-{smsd,smsd-inject,smsd-monitor} $(1)/usr/bin
65 50
 	$(INSTALL_DIR) $(1)/usr/lib
66
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{Gammu*,gsmsd*} $(1)/usr/lib
51
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/lib{Gammu*,gsmsd*} $(1)/usr/lib
67 52
 	$(INSTALL_DIR) $(1)/etc/init.d
68 53
 	$(INSTALL_DIR) $(1)/etc/config
69 54
 	$(INSTALL_CONF) ./files/gammu $(1)/etc/config/gammu