浏览代码

additional cleanups for ulfius

Reinhard Russinger 7 年之前
父节点
当前提交
00f36328d7
共有 4 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      package/libulfius/0001-makefile.patch
  2. 1 0
      package/libulfius/Config.in
  3. 1 1
      package/libulfius/libulfius.mk
  4. 0 1
      package/libyder/Config.in

+ 1 - 1
package/libulfius/0001-makefile.patch

@@ -15,7 +15,7 @@ diff -pruN a/src/Makefile b/src/Makefile
 -LIBS=-L$(PREFIX)/lib -L$(LIBORCANIA_LOCATION) -L$(LIBYDER_LOCATION) -lc -lmicrohttpd -lyder -lorcania -lpthread
 +PREFIX=/usr
 +CFLAGS=-c -pedantic -std=gnu99 -fPIC -Wall -D_REENTRANT $(ADDITIONALFLAGS) $(JANSSONFLAG) $(CURLFLAG) $(WEBSOCKETFLAG)
-+LIBS=-L$(PREFIX)/lib -lc -lmicrohttpd -lyder -lorcania -lpthread
++LIBS= -lc -lmicrohttpd -lyder -lorcania -lpthread
  OUTPUT=libulfius.so
  VERSION=2.2.4
  

+ 1 - 0
package/libulfius/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBULFIUS
 	bool "libulfius"
+	select BR2_PACKAGE_LIBORCANIA
 	select BR2_PACKAGE_LIBYDER
 	help
 		libulfius V 2.2.4

+ 1 - 1
package/libulfius/libulfius.mk

@@ -15,7 +15,7 @@ define LIBULFIUS_INSTALL_STAGING_CMDS
 	cp -d $(@D)/src/ulfius.h $(STAGING_DIR)/usr/include
 endef
 
-define LIULFIUS_INSTALL_TARGET_CMDS
+define LIBULFIUS_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/src/libulfius.so.$(ULFIUS_INST_VERSION) $(TARGET_DIR)/usr/lib/libulfius.so.$(ULFIUS_INST_VERSION)
 	cp -d $(@D)/src/libulfius.so $(TARGET_DIR)/usr/lib/libulfius.so
 endef

+ 0 - 1
package/libyder/Config.in

@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBYDER
 	bool "libyder"
 	select BR2_PACKAGE_LIBORCANIA
-	default y
 	help
 		liborcania component.config V 1.1.1