From 0e631ee30c4e4682099fc0141182b61d4010db94 Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 31 Oct 2006 08:44:54 +0000 Subject: [PATCH] Makefile cleanup (lang section) git-svn-id: svn://svn.openwrt.org/openwrt/packages@5353 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- lang/jamvm/Makefile | 37 ++++++-------- lang/lua/Makefile | 111 +++++++++++++++++++--------------------- lang/perl/Makefile | 7 +-- lang/php4/Makefile | 10 ++-- lang/php5/Makefile | 10 ++-- lang/python/Makefile | 8 +++ lang/sablevm-classpath/Makefile | 42 +++++++-------- lang/sablevm/Makefile | 28 +++++----- 8 files changed, 125 insertions(+), 128 deletions(-) diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile index 0859da2f2..2992143ac 100644 --- a/lang/jamvm/Makefile +++ b/lang/jamvm/Makefile @@ -11,14 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jamvm PKG_VERSION:=1.4.1 PKG_RELEASE:=1 -PKG_MD5SUM:=ed79d6b60e50b007614831f8c28321ac - -PKG_SOURCE_URL:=@SF/jamvm PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/jamvm +PKG_MD5SUM:=ed79d6b60e50b007614831f8c28321ac PKG_CAT:=zcat + PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -27,37 +26,33 @@ define Package/jamvm CATEGORY:=Languages DEPENDS:=+libffi-sable TITLE:=A compact Java Virtual Machine - DESCRIPTION:=JamVM is a new Java Virtual Machine which conforms to the JVM\\\ -specification version (blue book). In comparison to most other VM's\\\ -(free and commercial) it is extremely small.However, unlike other\\\ -small VMs (e.g. KVM) it is designed to support the full\\\ -specification, and includes support for object finalisation,\\\ -Soft/Weak/Phantom References, the Java Native Interface (JNI) and the\\\ -Reflection API.\\\ + DESCRIPTION:=\ + JamVM is a new Java Virtual Machine which conforms to the JVM \\\ + specification version (blue book). In comparison to most other VM's \\\ + (free and commercial) it is extremely small.However, unlike other \\\ + small VMs (e.g. KVM) it is designed to support the full \\\ + specification, and includes support for object finalisation, \\\ + Soft/Weak/Phantom References, the Java Native Interface (JNI) and the \\\ + Reflection API. URL:=http://sourceforge.net/projects/jamvm endef define Build/Configure -$(call Build/Configure/Default,--enable-ffi) + $(call Build/Configure/Default, \ + --enable-ffi \ + ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR)/usr/bin - mkdir -p $(PKG_INSTALL_DIR)/usr/share/jamvm $(MAKE) -C $(PKG_BUILD_DIR)/src \ $(TARGET_CONFIGURE_OPTS) - $(CP) $(PKG_BUILD_DIR)/src/jamvm $(PKG_INSTALL_DIR)/usr/bin - $(MAKE) -C $(PKG_BUILD_DIR)/lib - $(CP) $(PKG_BUILD_DIR)/lib/classes.zip $(PKG_INSTALL_DIR)/usr/share/jamvm endef - define Package/jamvm/install install -d -m0755 $(1)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/src/jamvm $(1)/usr/bin/ install -d -m0755 $(1)/usr/share/jamvm - $(CP) $(PKG_INSTALL_DIR)/usr/bin/jamvm $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/share/jamvm/classes.zip $(1)/usr/share/jamvm + install -m0644 $(PKG_BUILD_DIR)/lib/classes.zip $(1)/usr/share/jamvm/ endef $(eval $(call BuildPackage,jamvm)) diff --git a/lang/lua/Makefile b/lang/lua/Makefile index f62b40a94..bcdfa2819 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -12,7 +12,6 @@ PKG_NAME:=lua PKG_VERSION:=5.0.2 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ http://ftp.gwdg.de/pub/languages/lua/ \ @@ -21,63 +20,57 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ PKG_MD5SUM:= dea74646b7e5c621fef7174df83c34b1 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk +define Package/lua/Default + SECTION:=lang + CATEGORY:=Languages + TITLE:=LUA programming language + DESCRIPTION:=\ + Lua is a powerful light-weight programming language designed for extending \\\ + applications. Lua is also frequently used as a general-purpose, stand-alone \\\ + language. Lua is free software. + URL:=http://www.lua.org/ +endef + define Package/liblua + $(call Package/lua/Default) SECTION:=libs CATEGORY:=Libraries - TITLE:=LUA programming language (libraries) - DESCRIPTION:=LUA programming language (libraries).\\\ - Lua is a powerful light-weight programming language designed for extending \\\ - applications. Lua is also frequently used as a general-purpose, stand-alone \\\ - language. Lua is free software.\\\ - \\\ - This package contains the LUA shared libraries, needed by other programs. - URL:=http://www.lua.org/ + TITLE+= (libraries) + DESCRIPTION+=\\\ + \\\ + This package contains the LUA shared libraries, needed by other programs. endef define Package/lua - SECTION:=utils - CATEGORY:=Utilities + $(call Package/lua/Default) DEPENDS:=+liblua - TITLE:=LUA programming language (interpreter) - DESCRIPTION:=LUA programming language (interpreter).\\\ - Lua is a powerful light-weight programming language designed for extending \\\ - applications. Lua is also frequently used as a general-purpose, stand-alone \\\ - language. Lua is free software.\\\ - \\\ - This package contains the LUA language interpreter. - URL:=http://www.lua.org/ -endef - -define Package/lua-examples - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=lua - TITLE:=LUA programming language (examples) - DESCRIPTION:=LUA programming language (examples).\\\ - Lua is a powerful light-weight programming language designed for extending \\\ - applications. Lua is also frequently used as a general-purpose, stand-alone \\\ - language. Lua is free software.\\\ - \\\ - This package contains LUA language examples. - URL:=http://www.lua.org/ + TITLE+= (interpreter) + DESCRIPTION+=\\\ + \\\ + This package contains the LUA language interpreter. endef define Package/luac - SECTION:=utils - CATEGORY:=Utilities + $(call Package/lua/Default) DEPENDS:=+liblua - TITLE:=LUA programming language (compiler) - DESCRIPTION:=LUA programming language (compiler).\\\ - Lua is a powerful light-weight programming language designed for extending \\\ - applications. Lua is also frequently used as a general-purpose, stand-alone \\\ - language. Lua is free software.\\\ - \\\ - This package contains the LUA language compiler. - URL:=http://www.lua.org/ + TITLE+= (compiler) + DESCRIPTION+=\\\ + \\\ + This package contains the LUA language compiler. +endef + +define Package/lua-examples + $(call Package/lua/Default) + DEPENDS:=lua + TITLE+= (examples) + DESCRIPTION+=\\\ + \\\ + This package contains LUA language examples. endef define Build/Configure @@ -111,6 +104,21 @@ define Build/Compile install soinstall endef +define Build/InstallDev + mkdir -p $(STAGING_DIR)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/ + mkdir -p $(STAGING_DIR)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/ +endef + +define Build/UninstallDev + rm -rf \ + $(STAGING_DIR)/usr/include/lua{,lib}.h \ + $(STAGING_DIR)/usr/include/lauxlib.h \ + $(STAGING_DIR)/usr/lib/liblua{,lib}.{a,so*} +endef + define Package/liblua/install install -d -m0755 $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.so.* $(1)/usr/lib/ @@ -132,22 +140,7 @@ define Package/lua-examples/install $(1)/usr/share/lua/examples/ endef -define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/ -endef - -define Build/UninstallDev - rm -rf \ - $(STAGING_DIR)/usr/include/lua{,lib}.h \ - $(STAGING_DIR)/usr/include/lauxlib.h \ - $(STAGING_DIR)/usr/lib/liblua{,lib}.{a,so*} -endef - $(eval $(call BuildPackage,liblua)) $(eval $(call BuildPackage,lua)) -$(eval $(call BuildPackage,lua-examples)) $(eval $(call BuildPackage,luac)) +$(eval $(call BuildPackage,lua-examples)) diff --git a/lang/perl/Makefile b/lang/perl/Makefile index 936b1497e..ea737add5 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -12,7 +12,6 @@ PKG_NAME:=perl PKG_VERSION:=5.8.6 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \ ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \ @@ -21,14 +20,16 @@ PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \ PKG_MD5SUM:=8d4aa4e061fd5bc0c39e4f0a63267880 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/microperl SECTION:=utils CATEGORY:=Utilities TITLE:=A really minimal perl - DESCRIPTION:=A really minimal perl.\\\ - A perl package without operating-specific functions such as readdir. + DESCRIPTION:=\ + A perl package without operating-specific functions such as readdir. URL:=http://www.perl.com/ endef diff --git a/lang/php4/Makefile b/lang/php4/Makefile index 43f8b372e..f3bdc99d7 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -321,24 +321,24 @@ define Build/Compile endef define Package/php4/install - install -m0755 -d $(1)/etc + install -d -m0755 $(1)/etc install -m0644 ./files/php.ini $(1)/etc/ endef define Package/php4-cli/install - install -m0755 -d $(1)/usr/bin + install -d -m0755 $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php endef define Package/php4-cgi/install - install -m0755 -d $(1)/usr/bin + install -d -m0755 $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php endef define Package/php4-fastcgi/install - install -m0755 -d $(1)/usr/sbin + install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(1)/usr/sbin/php - install -m0755 -d $(1)/etc/init.d + install -d -m0755 $(1)/etc/init.d install -m0755 ./files/php.init $(1)/etc/init.d/php endef diff --git a/lang/php5/Makefile b/lang/php5/Makefile index fd82f479c..1b3177c05 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -325,24 +325,24 @@ define Build/Compile endef define Package/php5/install - install -m0755 -d $(1)/etc + install -d -m0755 $(1)/etc install -m0644 ./files/php.ini $(1)/etc/ endef define Package/php5-cli/install - install -m0755 -d $(1)/usr/bin + install -d -m0755 $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php endef define Package/php5-cgi/install - install -m0755 -d $(1)/usr/bin + install -d -m0755 $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php endef define Package/php5-fastcgi/install - install -m0755 -d $(1)/usr/sbin + install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(1)/usr/sbin/php - install -m0755 -d $(1)/etc/init.d + install -d -m0755 $(1)/etc/init.d install -m0755 ./files/php.init $(1)/etc/init.d/php endef diff --git a/lang/python/Makefile b/lang/python/Makefile index 638af2c6f..820a67be8 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -1,3 +1,11 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=python diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile index 7d41b249e..c2e0cfae4 100644 --- a/lang/sablevm-classpath/Makefile +++ b/lang/sablevm-classpath/Makefile @@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sablevm-classpath PKG_VERSION:=1.13 PKG_RELEASE:=1 -PKG_MD5SUM:=9476bb7a0ad67c6cfa353d06f094cdce -PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/ +PKG_MD5SUM:=9476bb7a0ad67c6cfa353d06f094cdce PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -22,43 +22,45 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -define Package/libsablevm-classpath +define Package/sablevm-classpath/Default SECTION:=lang CATEGORY:=Languages + URL:=http://www.gnu.org/software/classpath/ +endef + +define Package/libsablevm-classpath + $(call Package/sablevm-classpath/Default) TITLE:=Essential native libraries for Java - DESCRIPTION:=GNU Classpath, Essential Libraries for Java, is a GNU project to create\\\ - free core class libraries for use with virtual machines and compilers for\\\ + DESCRIPTION:=\ + GNU Classpath, Essential Libraries for Java, is a GNU project to create \\\ + free core class libraries for use with virtual machines and compilers for \\\ the java programming language.\\\ - This is a modified version for use with SableVM.\\\ - URL:=http://www.gnu.org/software/classpath/ + This is a modified version for use with SableVM. endef define Package/sablevm-classpath-full - SECTION:=lang - CATEGORY:=Languages - DEPENDS:=libsablevm-classpath - TITLE:=Full set + $(call Package/sablevm-classpath/Default) + DEPENDS:=+libsablevm-classpath + TITLE+= (full) endef define Package/sablevm-classpath-mini - SECTION:=lang - CATEGORY:=Languages - DEPENDS:=libsablevm-classpath - TITLE:=Minimal set + $(call Package/sablevm-classpath/Default) + DEPENDS:=+libsablevm-classpath + TITLE+= (minimal) endef define Build/Configure -$(call Build/Configure/Default,--enable-shared \ - --disable-static \ + $(call Build/Configure/Default, \ --disable-gtk-peer \ --disable-gtk-cairo \ - --without-x) + --with-jikes \ + --without-x \ + ) endef define Build/Compile - rm -rf $(PKG_INSTAL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile index 9cc63e663..2ac81b6f1 100644 --- a/lang/sablevm/Makefile +++ b/lang/sablevm/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=sablevm PKG_VERSION:=1.13 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/ PKG_MD5SUM:=d5828200032bfe921dd43e450931e38c PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -27,35 +27,33 @@ define Package/sablevm CATEGORY:=Languages DEPENDS:=+libffi-sable +libltdl +libpopt +libpthread +zlib TITLE:=A Java Virtual Machine (JVM) implementation - DESCRIPTION:=SableVM is a robust, extremely portable, efficient, and specifications-\\\ - -compliant Java virtual machine that aims to be easy to maintain and to \\\ - extend. It features a state-of-the-art and efficient interpreter engine.\\\ - Its source code is very accessible and easy to understand. It also has \\\ - many robustness features that have been the object of careful design. + DESCRIPTION:=\ + SableVM is a robust, extremely portable, efficient, and specifications-\\\ + -compliant Java virtual machine that aims to be easy to maintain and to \\\ + extend. It features a state-of-the-art and efficient interpreter engine.\\\ + Its source code is very accessible and easy to understand. It also has \\\ + many robustness features that have been the object of careful design. URL:=http://sablevm.org/ endef define Build/Configure - $(call Build/Configure/Default, \ - --enable-shared \ - --disable-static, \ - LIBS="-lffi -lltdl -lpopt -lz" \ - ) + $(call Build/Configure/Default, \ + , \ + LIBS="-lffi -lltdl -lpopt -lz" \ + ) endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef define Package/sablevm/install - install -m0755 -d $(1)/usr/bin + install -d -m0755 $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(1)/usr/bin/ - install -m0755 -d $(1)/usr/lib + install -d -m0755 $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(1)/usr/lib/ endef -- 2.11.0