KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tweak isakmpd & keynote makefiles

Browse source 
SVN-Revision: 6733
This commit is contained in:
Nicolas Thill 2007-03-28 00:06:18 +00:00
parent 10a482c835
commit f725f0dc49
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/isakmpd/Makefile
View file

@ -34,11 +34,10 @@ define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
LINUX_DIR="$(LINUX_DIR)" \ LINUX_DIR="$(LINUX_DIR)" \
EXTRA_CPPFLAGS="-I$(STAGING_DIR)/usr/include/openssl -I$(STAGING_DIR)/usr/include/keynote -I$(STAGING_DIR)/usr/include " \ EXTRA_CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/openssl -I$(STAGING_DIR)/usr/include/keynote" \
EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" EXTRA_LDFLAGS="$(TARGET_LDFLAGS)"
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
STAGING_DIR="$(STAGING_DIR)" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
INSTALL="install -c" \ INSTALL="install -c" \
install-bin install-bin

13
package/keynote/Makefile
View file

@ -7,7 +7,6 @@
# $Id$ # $Id$
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=keynote PKG_NAME:=keynote
PKG_VERSION:=2.3 PKG_VERSION:=2.3
@ -36,15 +35,9 @@ CONFIGURE_ARGS += \
--enable-static \ --enable-static \
--enable-shared --enable-shared
define Build/Compile
$(call Build/Compile/Default, \
LIBS="$(EXTRA_LDFLAGS) -L. -lkeynote -lm -lcrypto" \
)
endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/include mkdir -p $(STAGING_DIR)/usr/include/keynote
$(CP) $(PKG_BUILD_DIR)/{assertion,header,keynote,signature}.h $(STAGING_DIR)/usr/include/ $(CP) $(PKG_BUILD_DIR)/{assertion,header,keynote,signature}.h $(STAGING_DIR)/usr/include/keynote/
mkdir -p $(STAGING_DIR)/usr/lib mkdir -p $(STAGING_DIR)/usr/lib
$(CP) $(PKG_BUILD_DIR)/libkeynote.a $(STAGING_DIR)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/libkeynote.a $(STAGING_DIR)/usr/lib/
endef endef
@ -56,7 +49,7 @@ endef
define Package/keynote/install define Package/keynote/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/
endef endef
$(eval $(call BuildPackage,keynote)) $(eval $(call BuildPackage,keynote))

12
package/keynote/patches/001-build.patch
View file

@ -277,15 +277,25 @@ diff -ru keynote-2.3/keynote.y keynote-2.3.new/keynote.y
diff -ru keynote-2.3/Makefile.in keynote-2.3.new/Makefile.in diff -ru keynote-2.3/Makefile.in keynote-2.3.new/Makefile.in
--- keynote-2.3/Makefile.in 2000-09-27 01:16:27.000000000 +0200 --- keynote-2.3/Makefile.in 2000-09-27 01:16:27.000000000 +0200
+++ keynote-2.3.new/Makefile.in 2004-01-16 11:35:38.841528129 +0100 +++ keynote-2.3.new/Makefile.in 2004-01-16 11:35:38.841528129 +0100
@@ -41,7 +41,7 @@ @@ -41,7 +41,8 @@
YACCFLAGS = -d -p kn -b k YACCFLAGS = -d -p kn -b k
LEXFLAGS2 = -Pkv -s -i LEXFLAGS2 = -Pkv -s -i
LEXFLAGS = -Cr -Pkn -s -i LEXFLAGS = -Cr -Pkn -s -i
-CFLAGS = -O2 -Wall # -g -CFLAGS = -O2 -Wall # -g
+CFLAGS = -O2 -Wall -fno-strict-aliasing # -g +CFLAGS = -O2 -Wall -fno-strict-aliasing # -g
+LDFLAGS = @LDFLAGS@
RMFLAGS2 = -rf RMFLAGS2 = -rf
RMFLAGS = -f RMFLAGS = -f
NROFFFLAGS = -mandoc NROFFFLAGS = -mandoc
@@ -83,7 +84,7 @@
$(RANLIB) $(TARGET)
$(TARGET2): $(TARGET) $(OBJS2)
- $(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
+ $(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LDFLAGS) $(LIBS)
k.tab.c: keynote.y header.h keynote.h assertion.h config.h
$(YACC) $(YACCFLAGS) keynote.y
diff -ru keynote-2.3/signature.c keynote-2.3.new/signature.c diff -ru keynote-2.3/signature.c keynote-2.3.new/signature.c
--- keynote-2.3/signature.c 1999-10-12 00:34:31.000000000 +0200 --- keynote-2.3/signature.c 1999-10-12 00:34:31.000000000 +0200
+++ keynote-2.3.new/signature.c 2004-01-16 11:30:48.062084986 +0100 +++ keynote-2.3.new/signature.c 2004-01-16 11:30:48.062084986 +0100