From 90d5c8b73e8d538e121275b12e714332ca785cff Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 21 Oct 2013 17:20:24 +0200 Subject: automatically create development subpackages, without user interaction, depend on gcc for the target, simplifies a lot of library packages --- BUGS | 3 + Makefile | 4 + TODO | 10 +- mk/build.mk | 2 +- mk/package.mk | 21 +++- mk/pkg-bottom.mk | 19 ++++ package/.templatelib/Makefile | 28 +++++ package/.templateprog/Makefile | 29 +++++ package/DirectFB/Makefile | 20 +--- package/MesaLib/Makefile | 18 +--- package/SDL_gfx/Makefile | 15 +-- package/SDL_ttf/Makefile | 18 +--- package/alsa-lib/Makefile | 15 +-- package/apr/Makefile | 14 +-- package/atk/Makefile | 17 +-- package/avahi/Makefile | 6 +- package/bigreqsproto/Makefile | 12 +-- package/boost/Makefile | 10 +- package/cairo/Makefile | 12 +-- package/compositeproto/Makefile | 10 +- package/cryptsetup/Makefile | 16 +-- package/cups/Makefile | 15 +-- package/curl/Makefile | 19 +--- package/cxxtools/Makefile | 17 +-- package/cyrus-sasl/Makefile | 15 +-- package/damageproto/Makefile | 10 +- package/db/Makefile | 14 +-- package/dbus-glib/Makefile | 21 +--- package/dbus/Makefile | 19 +--- package/dri2proto/Makefile | 10 +- package/e2fsprogs/Makefile | 28 ++--- package/eglibc/Config.in.manual | 9 -- package/expat/Makefile | 16 +-- package/faac/Makefile | 6 +- package/faad2/Makefile | 8 +- package/file/Makefile | 13 +-- package/fixesproto/Makefile | 10 +- package/flex/Makefile | 12 +-- package/font-util/Makefile | 13 +-- package/fontcacheproto/Makefile | 6 +- package/fontconfig/Makefile | 18 +--- package/fontsproto/Makefile | 10 +- package/freetype/Makefile | 19 +--- package/fuse/Makefile | 19 +--- package/gcc/Makefile | 35 ++++-- package/gdbm/Makefile | 14 +-- package/gdk-pixbuf/Makefile | 17 +-- package/gettext/Makefile | 86 --------------- package/gettext/patches/patch-build-aux_ltmain_sh | 39 ------- .../patch-gettext-runtime_gnulib-lib_stdio_in_h | 10 -- ...gettext-tools_gnulib-lib_libxml_xmlversion_in_h | 11 -- .../patch-gettext-tools_gnulib-lib_spawn_in_h | 11 -- .../patch-gettext-tools_gnulib-lib_stdio_in_h | 10 -- .../patch-gettext-tools_libgettextpo_stdio_in_h | 10 -- package/giblib/Makefile | 5 +- package/giflib/Makefile | 12 +-- package/glib/Makefile | 13 +-- package/glibc/Config.in.manual | 10 -- package/glibc/Makefile | 11 -- package/glproto/Makefile | 10 +- package/gmp/Makefile | 14 +-- package/gtk+/Makefile | 16 +-- package/inputproto/Makefile | 10 +- package/iptables/Makefile | 13 +-- package/jpeg/Makefile | 14 +-- package/kbproto/Makefile | 10 +- package/krb5/Makefile | 19 +--- package/libICE/Makefile | 17 +-- package/libIDL/Makefile | 21 +--- package/libSM/Makefile | 17 +-- package/libX11/Makefile | 17 +-- package/libXScrnSaver/Makefile | 7 +- package/libXau/Makefile | 20 +--- package/libXaw/Makefile | 14 +-- package/libXcomposite/Makefile | 18 +--- package/libXcursor/Makefile | 18 +--- package/libXdamage/Makefile | 18 +--- package/libXdmcp/Makefile | 19 +--- package/libXext/Makefile | 19 +--- package/libXfixes/Makefile | 18 +--- package/libXfont/Makefile | 18 +--- package/libXft/Makefile | 17 +-- package/libXi/Makefile | 17 +-- package/libXinerama/Makefile | 17 +-- package/libXmu/Makefile | 17 +-- package/libXp/Makefile | 16 +-- package/libXpm/Makefile | 17 +-- package/libXrandr/Makefile | 16 +-- package/libXrender/Makefile | 17 +-- package/libXt/Makefile | 17 +-- package/libXtst/Makefile | 17 +-- package/libXv/Makefile | 18 +--- package/libXxf86dga/Makefile | 7 +- package/libXxf86vm/Makefile | 18 +--- package/libaio/Makefile | 6 +- package/libantlr3c/Makefile | 5 +- package/libao/Makefile | 7 +- package/libart/Makefile | 7 +- package/libass/Makefile | 5 +- package/libaudiofile/Makefile | 18 +--- package/libavl/Makefile | 5 +- package/libbluray/Makefile | 5 +- package/libcapi20/Makefile | 12 +-- package/libcdio/Makefile | 5 +- package/libcli/Makefile | 12 +-- package/libdaemon/Makefile | 5 +- package/libdnet/Makefile | 18 +--- package/libdrm/Makefile | 18 +--- package/libelf/Makefile | 6 +- package/libevent/Makefile | 14 +-- package/libffi/Makefile | 12 +-- package/libfontenc/Makefile | 15 +-- package/libgcrypt/Makefile | 18 +--- package/libgd/Makefile | 15 +-- package/libglew/Makefile | 5 +- package/libgpg-error/Makefile | 18 +--- package/libgssglue/Makefile | 17 +-- package/libhugetlbfs/Makefile | 9 +- package/libiconv/Makefile | 14 +-- package/libid3tag/Makefile | 7 +- package/libjasper/Makefile | 5 +- package/libjpeg-turbo/Makefile | 5 +- package/liblzo/Makefile | 16 +-- package/libmad/Makefile | 14 +-- package/libmicrohttpd/Makefile | 5 +- package/libmms/Makefile | 7 +- package/libmnl/Makefile | 5 +- package/libmodplug/Makefile | 5 +- package/libmpc/Makefile | 12 +-- package/libmpdclient/Makefile | 19 +--- package/libmpeg2/Makefile | 5 +- package/libnet/Makefile | 17 +-- package/libnetfilter_acct/Makefile | 7 +- package/libnetfilter_conntrack/Makefile | 17 +-- package/libnetfilter_cthelper/Makefile | 7 +- package/libnetfilter_cttimeout/Makefile | 7 +- package/libnetfilter_log/Makefile | 18 +--- package/libnetfilter_queue/Makefile | 7 +- package/libnettle/Makefile | 5 +- package/libnfnetlink/Makefile | 17 +-- package/libnfsidmap/Makefile | 15 +-- package/libnids/Makefile | 14 +-- package/libnl/Makefile | 17 +-- package/libnotify/Makefile | 7 +- package/libogg/Makefile | 16 +-- package/libol/Makefile | 7 +- package/libosip2/Makefile | 7 +- package/libp11/Makefile | 19 +--- package/libpcap/Makefile | 14 +-- package/libpciaccess/Makefile | 18 +--- package/libpng/Makefile | 17 +-- package/libpri/Makefile | 7 +- package/libpthread-stubs/Makefile | 10 +- package/libqb/Makefile | 5 +- package/librpcsecgss/Makefile | 7 +- package/libsamplerate/Makefile | 5 +- package/libshout/Makefile | 7 +- package/libsigc++/Makefile | 7 +- package/libtasn1/Makefile | 7 +- package/libtheora/Makefile | 5 +- package/libtiff/Makefile | 17 +-- package/libtirpc/Makefile | 14 +-- package/libtool/Makefile | 13 +-- package/libtorrent/Makefile | 5 +- package/libunistring/Makefile | 5 +- package/libupnp/Makefile | 14 +-- package/libusb-compat/Makefile | 17 +-- package/libusb/Makefile | 17 +-- package/libvirt/Makefile | 7 +- package/libvorbis/Makefile | 14 +-- package/libvorbisidec/Makefile | 7 +- package/libvpx/Makefile | 5 +- package/libx264/Makefile | 5 +- package/libxcb/Makefile | 18 +--- package/libxkbfile/Makefile | 18 +--- package/libxml2/Makefile | 20 +--- package/libxslt/Makefile | 17 +-- package/linux-atm/Makefile | 13 +-- package/lm_sensors/Makefile | 14 +-- package/log4cplus/Makefile | 7 +- package/log4cxx/Makefile | 15 +-- package/lvm/Makefile | 16 +-- package/mpfr/Makefile | 12 +-- package/musl/Config.in.manual | 9 -- package/mysql/Makefile | 15 +-- package/ncurses/Makefile | 18 +--- package/neon/Makefile | 21 +--- package/nspr/Makefile | 12 +-- package/openct/Makefile | 21 ++-- package/openldap/Makefile | 16 +-- package/opensc/Makefile | 18 ++-- package/openssl/Makefile | 16 +-- package/orbit2/Makefile | 19 +--- package/pango/Makefile | 18 +--- package/pcre/Makefile | 19 +--- package/pcsc-lite/Makefile | 19 +--- package/pixman/Makefile | 18 +--- package/polarssl/Makefile | 15 +-- package/popt/Makefile | 16 +-- package/postgresql/Makefile | 14 +-- package/printproto/Makefile | 10 +- package/randrproto/Makefile | 10 +- package/readline/Makefile | 16 +-- package/recordproto/Makefile | 10 +- package/renderproto/Makefile | 10 +- package/resourceproto/Makefile | 10 +- package/scrnsaverproto/Makefile | 10 +- package/sdl-image/Makefile | 19 +--- package/sdl/Makefile | 20 +--- package/section.lst | 1 - package/sysfsutils/Makefile | 16 +-- package/uclibc/Config.in.manual | 9 -- package/util-linux/Makefile | 36 +++---- package/videoproto/Makefile | 10 +- package/xcb-proto/Makefile | 15 +-- package/xcmiscproto/Makefile | 10 +- package/xextproto/Makefile | 10 +- package/xf86dgaproto/Makefile | 10 +- package/xf86driproto/Makefile | 11 +- package/xf86vidmodeproto/Makefile | 10 +- package/xineramaproto/Makefile | 10 +- package/xorg-server/Makefile | 18 +--- package/xproto/Makefile | 10 +- package/xtrans/Makefile | 10 +- package/zlib/Makefile | 20 ++-- scripts/make-ipkg-dir.sh | 4 +- tools/adk/pkgmaker.c | 117 +++++++++++++++++++-- 227 files changed, 939 insertions(+), 2244 deletions(-) create mode 100644 package/.templatelib/Makefile create mode 100644 package/.templateprog/Makefile delete mode 100644 package/gettext/Makefile delete mode 100644 package/gettext/patches/patch-build-aux_ltmain_sh delete mode 100644 package/gettext/patches/patch-gettext-runtime_gnulib-lib_stdio_in_h delete mode 100644 package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h delete mode 100644 package/gettext/patches/patch-gettext-tools_gnulib-lib_spawn_in_h delete mode 100644 package/gettext/patches/patch-gettext-tools_gnulib-lib_stdio_in_h delete mode 100644 package/gettext/patches/patch-gettext-tools_libgettextpo_stdio_in_h diff --git a/BUGS b/BUGS index f08dabec5..40358ba82 100644 --- a/BUGS +++ b/BUGS @@ -1,3 +1,6 @@ +- qemu-sparc with glibc/eglibc does not compile +- qemu-ppc64 does not boot +- cris foxboard-lx is broken, binutils failure - openssh on amd64 does not work, ssh-keygen endless loop - uclibc on lemote mips64 target does not work (only uclibc-trunk with patches) - qemu-mips64* targets does not boot, kernel problem? diff --git a/Makefile b/Makefile index 850a67283..49623ffe0 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,10 @@ dev-help: @echo '' @echo 'Adding a new package:' @echo 'make PKG=foo VER=1.0 newpackage' + @echo 'Adding a new simple library package:' + @echo 'make PKG=foo VER=1.0 TYPE=lib newpackage' + @echo 'Adding a new simple program package:' + @echo 'make PKG=foo VER=1.0 TYPE=prog newpackage' clean: .prereq_done -@rm -f nohup.out diff --git a/TODO b/TODO index 893baa011..fb50f8e17 100644 --- a/TODO +++ b/TODO @@ -1 +1,9 @@ -nothing right now. +- port full blown perl +- implement host build infrastructure, fixes update-patches for the package + needed for ncurses, file, mesalib, openldap, python2, .. +- gcc fixed-includes disabling +http://www.linuxfromscratch.org/lfs/view/7.1/chapter05/gcc-pass2.html +- port w3m +- port libcec for xbmc +- check xbmc samba/nfs support +- add support for librtmp in xbmc diff --git a/mk/build.mk b/mk/build.mk index 3f0fca18e..b597dbc61 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -244,7 +244,7 @@ kernelconfig: # create a new package from package/.template newpackage: @echo "Creating new package $(PKG)" - $(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG) + $(CP) $(TOPDIR)/package/.template$(TYPE) $(TOPDIR)/package/$(PKG) pkg=$$(echo $(PKG)|tr '[:lower:]-' '[:upper:]_'); \ $(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile diff --git a/mk/package.mk b/mk/package.mk index 9e880d5ef..ca1b84fc3 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -98,11 +98,12 @@ build-all-pkgs: ${_IPKGS_COOKIE} # 4.) dependencies to other packages, $(PKG_DEPENDS) # 5.) description for the package, $(PKG_DESCR) # 6.) section of the package, $(PKG_SECTION) -# 7.) special package options +# 7.) special package options $(PKG_OPTS) # noscripts -> do not install scripts to $(STAGING_TARGET_DIR)/target/scripts # (needed for example for autoconf/automake) # noremove -> do not remove files from $(STAGING_TARGET_DIR)/target while # cleaning (needed for toolchain packages like glibc/eglibc) +# dev -> create a development subpackage with headers and pkg-config files # should be package format independent and modular in the future define PKG_template ALL_PKGOPTS+= $(1) @@ -111,7 +112,9 @@ PKGDEPS_$(1)= $(4) PKGDESC_$(1)= $(5) PKGSECT_$(1)= $(6) IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX} +IPKG_$(1)_DEV= $(PACKAGE_DIR)/$(2)-dev_$(3)_${CPU_ARCH}.${PKG_SUFFIX} IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) +IDIR_$(1)_DEV= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dev ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) ALL_IPKGS+= $$(IPKG_$(1)) ALL_IDIRS+= $${IDIR_$(1)} @@ -128,6 +131,7 @@ IDEPEND_$(1):= $$(strip $(4)) _ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control ICONTROL_$(1)?= $(WRKDIR)/.$(2).control +ICONTROL_$(1)_DEV?= $(WRKDIR)/.$(2)-dev.control $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} @echo "Package: $$(shell echo $(2) | tr '_' '-')" > $(WRKDIR)/.$(2).control @echo "Section: $(6)" >> $(WRKDIR)/.$(2).control @@ -151,6 +155,13 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} @for file in conffiles preinst postinst prerm postrm; do \ [ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \ done +ifneq (,$(filter dev,$(7))) + echo "Package: $$(shell echo $(2) | tr '_' '-')-dev" > $(WRKDIR)/.$(2)-dev.control + echo "Section: devel" >> $(WRKDIR)/.$(2)-dev.control + echo "Description: development files for $(2)" >> $(WRKDIR)/.$(2)-dev.control + ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DEV} $${ICONTROL_$(1)_DEV} $(3) ${CPU_ARCH} + echo "Depends: $$(shell echo $(2) | tr '_' '-')" >> $${IDIR_$(1)_DEV}/CONTROL/control +endif $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE} ifeq ($(ADK_DEBUG),) @@ -222,9 +233,14 @@ ifeq (,$(filter noscripts,$(7))) endif ifeq (,$(filter libmix,$(7))) ifeq (,$(filter libonly,$(7))) +ifeq (,$(filter devonly,$(7))) $${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE) endif endif +endif +ifneq (,$(filter dev,$(7))) + $${PKG_BUILD} $${IDIR_$(1)_DEV} $${PACKAGE_DIR} $(MAKE_TRACE) +endif clean-targets: clean-dev-$(1) @@ -241,6 +257,9 @@ endif $$(INFO_$(1)): $$(IPKG_$(1)) $(PKG_INSTALL) $$(IPKG_$(1)) +ifneq (,$(filter dev,$(7))) + $(PKG_INSTALL) $$(IPKG_$(1)_DEV) +endif endef install-targets: diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 9f92f9349..0dd93468d 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -12,6 +12,7 @@ # are required, but the do-foo: magic is done here REORDER_DEPENDENCIES= ${TOPDIR}/scripts/automake.dep +PKG_LIBNAME?= $(PKG_NAME) pre-configure: do-configure: @@ -142,6 +143,7 @@ else @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2 @exit 1 endif + @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}.scripts' @for a in ${WRKINST}/usr/bin/*-config*; do \ [[ -e $$a ]] || continue; \ sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \ @@ -166,6 +168,23 @@ ifeq (,$(filter noremove,${PKG_OPTS})) fi endif @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}' +ifneq (,$(filter dev,${PKG_OPTS})) + mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include + test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ + find . -name \*.h | \ + $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include + mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig + test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ + find . -name \*.pc | \ + $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig + for a in ${WRKINST}/usr/bin/*-config*; do \ + [[ -e $$a ]] || continue; \ + mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ + cp $$a $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ + chmod 755 $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin/$$(basename $$a); \ + done + #env ${MAKE_ENV} ${MAKE} ${PKG_LIBNAME}-dev-install $(MAKE_TRACE) +endif @-cd ${WRKINST}; \ if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \ find lib \( -name lib\*.so\* -o -name lib\*.a \) \ diff --git a/package/.templatelib/Makefile b/package/.templatelib/Makefile new file mode 100644 index 000000000..8d4331672 --- /dev/null +++ b/package/.templatelib/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= @PKG@ +PKG_VERSION:= @VER@ +PKG_RELEASE:= 1 +PKG_MD5SUM:= add md5sum of package here +PKG_DESCR:= add short description +PKG_SECTION:= libs +PKG_URL:= add project url +PKG_SITES:= add download url without package name +PKG_OPTS:= dev + +# if downloaded package is not ending with .tar.gz use following +#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +@PKG@-install: + $(INSTALL_DIR) $(IDIR_@UPKG@)/usr/lib + $(CP) $(WRKINST)/usr/lib/@PKG@*.so* \ + $(IDIR_@UPKG@)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/.templateprog/Makefile b/package/.templateprog/Makefile new file mode 100644 index 000000000..ec7ae409f --- /dev/null +++ b/package/.templateprog/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= @PKG@ +PKG_VERSION:= @VER@ +PKG_RELEASE:= 1 +PKG_MD5SUM:= add md5sum of package here +PKG_DESCR:= add short description +PKG_SECTION:= add section +PKG_DEPENDS:= add dependendant package names +PKG_BUILDDEP:= add packages which need to be compiled +PKG_URL:= add project url +PKG_SITES:= add download url without package name + +# if downloaded package is not ending with .tar.gz use following +#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +@PKG@-install: + $(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \ + $(IDIR_@UPKG@)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 3b4654eff..14eef4e6e 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= DirectFB PKG_VERSION:= 1.6.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_EXTRAVER:= 1.6-0 PKG_MD5SUM:= 641e8e999c017770da647f9b5b890906 PKG_DESCR:= Thin graphic library for the Linux framebuffer devices @@ -14,15 +14,12 @@ PKG_DEPENDS:= libpng libjpeg libfreetype PKG_BUILDDEP:= libpng jpeg freetype PKG_URL:= http://www.directfb.org/ PKG_SITES:= http://directfb.org/downloads/Core/DirectFB-1.6/ - -PKG_SUBPKGS:= DIRECTFB DIRECTFB_DEV -PKGSD_DIRECTFB_DEV:= development files for DirectFB -PKGSC_DIRECTFB_DEV:= devel +PKG_LIBNAME:= directfb +PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DIRECTFB_DEV,directfb-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DIRECTFB_DEV},${PKGSC_DIRECTFB_DEV})) +$(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32 CONFIGURE_ARGS+= --with-inputdrivers=linuxinput,keyboard,ps2mouse \ @@ -47,7 +44,7 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) XAKE_FLAGS+= LDFLAGS=$(ADK_TARGET_ABI_CFLAGS) endif -post-install: +directfb-install: ${INSTALL_DIR} ${IDIR_DIRECTFB}/etc ${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc $(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm} @@ -67,11 +64,4 @@ post-install: ${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/*.so \ ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider -directfb-dev-install: - ${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/directfb ${IDIR_DIRECTFB_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/directfb-config \ - ${IDIR_DIRECTFB_DEV}/usr/bin - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 008c4eb4f..e69d274cf 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= MesaLib PKG_VERSION:= 8.0.5 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= cda5d101f43b8784fa60bdeaca4056f2 PKG_DESCR:= MESA library PKG_SECTION:= libs @@ -15,10 +15,7 @@ PKG_BUILDDEP+= dri2proto glproto expat libXext PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/ PKG_NEED_CXX:= 1 - -PKG_SUBPKGS:= MESALIB MESALIB_DEV -PKGSD_MESALIB_DEV:= MESA headers -PKGSC_MESALIB_DEV:= devel +PKG_OPTS:= dev PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm @@ -26,8 +23,7 @@ WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,MESALIB_DEV,mesalib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MESALIB_DEV},${PKGSC_MESALIB_DEV})) +$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) XAKE_FLAGS+= GCC_HONOUR_COPTS=s @@ -76,12 +72,4 @@ ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) ${IDIR_MESALIB}/usr/lib/dri/ endif -mesalib-dev-install: - $(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/include - ${CP} ${WRKINST}/usr/include/* \ - $(IDIR_MESALIB_DEV)/usr/include - $(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/lib/pkgconfig - ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ - $(IDIR_MESALIB_DEV)/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/SDL_gfx/Makefile b/package/SDL_gfx/Makefile index 756d9d001..b0e114ef0 100644 --- a/package/SDL_gfx/Makefile +++ b/package/SDL_gfx/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= SDL_gfx PKG_VERSION:= 2.0.22 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 330f291f1f09a1bdf397c9b40d92ca41 PKG_DESCR:= SDL GFX library PKG_SECTION:= libs @@ -13,17 +13,14 @@ PKG_DEPENDS:= libsdl PKG_BUILDDEP:= sdl PKG_URL:= http://www.ferzkopp.net/joomla/content/view/19/14/ PKG_SITES:= http://www.ferzkopp.net/Software/SDL_gfx-2.0/ +PKG_LIBNAME:= libsdl-gfx +PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !m68k -PKG_SUBPKGS:= LIBSDL_GFX LIBSDL_GFX_DEV -PKGSD_LIBSDL_GFX_DEV:= development files for SDL_gfx -PKGSC_LIBSDL_GFX_DEV:= devel - include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBSDL_GFX_DEV,libsdl-gfx-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_GFX_DEV},${PKGSC_LIBSDL_GFX_DEV})) +$(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ARGS+= --disable-mmx @@ -31,8 +28,4 @@ libsdl-gfx-install: $(INSTALL_DIR) $(IDIR_LIBSDL_GFX)/usr/lib $(CP) $(WRKINST)/usr/lib/libSDL_gfx.so* $(IDIR_LIBSDL_GFX)/usr/lib -libsdl-gfx-dev-install: - $(INSTALL_DIR) $(IDIR_LIBSDL_GFX_DEV)/usr/include - $(CP) $(WRKINST)/usr/include/* $(IDIR_LIBSDL_GFX_DEV)/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile index d6025f2fb..d8d954521 100644 --- a/package/SDL_ttf/Makefile +++ b/package/SDL_ttf/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= SDL_ttf PKG_VERSION:= 2.0.10 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 814e6e17e8879254208d23b3b7e0354b PKG_DESCR:= TrueType fonts in your SDL applications PKG_SECTION:= libs @@ -13,27 +13,17 @@ PKG_DEPENDS:= libsdl libfreetype PKG_BUILDDEP:= sdl freetype gettext-tiny PKG_URL:= http://www.libsdl.org/projects/SDL_ttf/ PKG_SITES:= http://www.libsdl.org/projects/SDL_ttf/release/ +PKG_LIBNAME:= libsdl-ttf +PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !m68k -PKG_SUBPKGS:= LIBSDL_TTF LIBSDL_TTF_DEV -PKGSD_LIBSDL_TTF_DEV:= development files -PKGSC_LIBSDL_TTF_DEV:= devel - include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBSDL_TTF_DEV,libsdl-ttf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_TTF_DEV},${PKGSC_LIBSDL_TTF_DEV})) +$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) libsdl-ttf-install: $(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib $(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib -libsdl-ttf-dev-install: - $(INSTALL_DIR) $(IDIR_LIBSDL_TTF_DEV)/usr/include - $(CP) $(WRKINST)/usr/include/* $(IDIR_LIBSDL_TTF_DEV)/usr/include - $(INSTALL_DIR) $(IDIR_LIBSDL_TTF_DEV)/usr/lib/pkgconfig - $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \ - $(IDIR_LIBSDL_TTF_DEV)/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index 9e1c0bedd..d4505755e 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -11,19 +11,15 @@ PKG_DESCR:= ALSA sound library PKG_SECTION:= libs PKG_URL:= http://www.alsa-project.org/ PKG_SITES:= ftp://ftp.alsa-project.org/pub/lib/ +PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !m68k -PKG_SUBPKGS:= ALSA_LIB ALSA_LIB_DEV -PKGSD_ALSA_LIB_DEV:= development files for ALSA -PKGSC_ALSA_LIB_DEV:= devel - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,ALSA_LIB_DEV,alsa-lib-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ALSA_LIB_DEV},${PKGSC_ALSA_LIB_DEV})) +$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CPPFLAGS+= -D_POSIX_C_SOURCE=1 CONFIGURE_ARGS+= --disable-python @@ -33,11 +29,4 @@ alsa-lib-install: ${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib ${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa -alsa-lib-dev-install: - ${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/include/{sys,alsa} - ${CP} ${WRKINST}/usr/include/sys/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/sys - ${CP} ${WRKINST}/usr/include/alsa/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/alsa - ${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/lib/pkgconfig - $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc ${IDIR_ALSA_LIB_DEV}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/apr/Makefile b/package/apr/Makefile index 586495e24..ba53c9c92 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -5,25 +5,21 @@ include ${TOPDIR}/rules.mk PKG_NAME:= apr PKG_VERSION:= 1.4.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 76cc4457fbb71eefdafa27dba8f511fb PKG_DESCR:= Apache Portable Runtime library PKG_SECTION:= libs PKG_DEPENDS:= libpthread PKG_URL:= http://apr.apache.org/ PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ - -PKG_SUBPKGS:= APR APR_DEV -PKGSC_APR_DEV:= devel -PKGSD_APR_DEV:= apr headers +PKG_OPTS:= dev PKG_FLAVOURS_APR:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,APR,apr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,APR_DEV,apr-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_APR_DEV},${PKGSC_APR_DEV})) +$(eval $(call PKG_template,APR,apr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) @@ -57,8 +53,4 @@ apr-install: ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1 ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/ -apr-dev-install: - ${INSTALL_DIR} ${IDIR_APR_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_APR_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/atk/Makefile b/package/atk/Makefile index 58781ae99..44ea350f8 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -5,37 +5,28 @@ include ${TOPDIR}/rules.mk PKG_NAME:= atk PKG_VERSION:= 1.33.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 4338e0c94f767714f4786878112750dd PKG_DESCR:= atk library PKG_SECTION:= libs PKG_BUILDDEP:= glib PKG_URL:= http://www.gnome.org/ PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/1.33/} +PKG_LIBNAME:= libatk +PKG_OPTS:= dev #DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz -PKG_SUBPKGS:= LIBATK LIBATK_DEV -PKGSC_LIBATK_DEV:= devel -PKGSD_LIBATK_DEV:= libatk headers - ifeq ($(ADK_STATIC),y) -PKG_OPTS:= libonly +PKG_OPTS+= libonly endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBATK,libatk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,LIBATK_DEV,libatk-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBATK_DEV},${PKGSC_LIBATK_DEV},${PKG_OPTS})) libatk-install: ${INSTALL_DIR} ${IDIR_LIBATK}/usr/lib ${CP} ${WRKINST}/usr/lib/libatk-*.so* ${IDIR_LIBATK}/usr/lib -libatk-dev-install: - ${INSTALL_DIR} ${IDIR_LIBATK_DEV}/usr/lib/pkgconfig - ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_LIBATK_DEV}/usr/lib/pkgconfig - ${INSTALL_DIR} ${IDIR_LIBATK_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBATK_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 6e5330aac..ba5db4f04 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= avahi PKG_VERSION:= 0.6.30 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= e4db89a2a403ff4c47d66ac66fad1f43 PKG_DESCR:= mDNS daemon PKG_SECTION:= dhcp @@ -13,6 +13,8 @@ PKG_BUILDDEP:= libdaemon expat gdbm glib gettext-tiny gtk+ dbus PKG_URL:= http://avahi.org/ PKG_SITES:= http://avahi.org/download/ PKG_NEED_CXX:= 1 +PKG_LIBNAME:= libavahi +PKG_OPTS:= dev PKG_SUBPKGS:= AVAHI_DAEMON AVAHI_DNSCONFD LIBAVAHI PKGSS_AVAHI_DAEMON:= libavahi libdaemon libexpat libintl libgtk dbus @@ -25,7 +27,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DAEMON},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION})) -$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI})) +$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI},${PKG_OPTS})) CONFIGURE_ARGS+= --enable-glib \ --enable-gtk2 \ diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile index 2861d2e73..b48634a90 100644 --- a/package/bigreqsproto/Makefile +++ b/package/bigreqsproto/Makefile @@ -5,21 +5,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= bigreqsproto PKG_VERSION:= 1.1.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_DESCR:= Big Requests Extension headers -PKG_SECTION:= x11/devel +PKG_SECTION:= devel PKG_MD5SUM:= 9b83369ac7a5eb2bf54c8f34db043a0e PKG_SITES:= ${MASTER_SITE_XORG} +PKG_OPTS:= dev devonly include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BIGREQSPROTO,bigreqsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -post-install: - ${INSTALL_DIR} ${IDIR_BIGREQSPROTO}/usr/include - ${CP} ${WRKINST}/usr/include/X11 ${IDIR_BIGREQSPROTO}/usr/include - ${INSTALL_DIR} ${IDIR_BIGREQSPROTO}/usr/lib/pkgconfig - ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/bigreqsproto.pc \ - ${IDIR_BIGREQSPROTO}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/boost/Makefile b/package/boost/Makefile index e2f2ed3cb..6de8a1abf 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -5,22 +5,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= boost PKG_VERSION:= 1.54.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= efbfbff5a85a9330951f243d0a46e4b9 PKG_DESCR:= boost C++ library PKG_SECTION:= libs PKG_URL:= http://www.boost.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/} +PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !avr32 !m68k DISTFILES:= boost_1_54_0.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_1_54_0 -PKG_SUBPKGS:= BOOST BOOST_DEV -PKGSD_BOOST_DEV:= boost header files -PKGSC_BOOST_DEV:= devel - PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave PKGFD_date_time:= with date-time @@ -42,8 +39,7 @@ PKGFD_wave:= with wave include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BOOST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,BOOST_DEV,boost-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BOOST_DEV},${PKGSC_BOOST_DEV})) +$(eval $(call PKG_template,BOOST,boost,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= manual BUILD_STYLE:= manual diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 887a60425..3fb1142c5 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo PKG_VERSION:= 1.10.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f PKG_DESCR:= cairo graphics library PKG_SECTION:= libs @@ -15,21 +15,17 @@ PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib PKG_BUILDDEP+= libXext PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ +PKG_OPTS:= dev #DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz -PKG_SUBPKGS:= CAIRO CAIRO_DEV -PKGSC_CAIRO_DEV:= devel -PKGSD_CAIRO_DEV:= cairo headers - ifeq ($(ADK_STATIC),y) -PKG_OPTS:= libonly +PKG_OPTS+= libonly endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS})) +$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS},${PKG_OPTS})) ifeq (,$(filter arm,$(TARGET_ARCH))) TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS)) diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile index fa31132df..ffcb9574f 100644 --- a/package/compositeproto/Makefile +++ b/package/compositeproto/Makefile @@ -8,18 +8,12 @@ PKG_VERSION:= 0.4.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 2dea7c339432b3363faf2d29c208e7b5 PKG_DESCR:= X11 composite headers -PKG_SECTION:= x11/devel +PKG_SECTION:= devel PKG_SITES:= ${MASTER_SITE_XORG} +PKG_OPTS:= dev devonly include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,COMPOSITEPROTO,compositeproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -post-install: - ${INSTALL_DIR} ${IDIR_COMPOSITEPROTO}/usr/include - ${CP} ${WRKINST}/usr/include/X11 ${IDIR_COMPOSITEPROTO}/usr/include - ${INSTALL_DIR} ${IDIR_COMPOSITEPROTO}/usr/lib/pkgconfig - ${CP} ${WRKINST}/usr/lib/pkgconfig/compositeproto.pc \ - ${IDIR_COMPOSITEPROTO}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index d0dd12b21..c98e2e8ac 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cryptsetup PKG_VERSION:= 1.3.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 1f5b5a9d538e8a3c191fb7dd85b9b013 PKG_DESCR:= LUKS cryptsetup tools PKG_SECTION:= crypto @@ -15,9 +15,7 @@ PKG_DEPENDS+= kmod-crypto-sha256 kmod-blk-dev-dm libgcc PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com/ PKG_SITES:= http://cryptsetup.googlecode.com/files/ - -PKG_SUBPKGS:= CRYPTSETUP CRYPTSETUP_DEV -PKGSC_CRYPTSETUP_DEV:= devel +PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !cris @@ -25,22 +23,16 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,CRYPTSETUP_DEV,cryptsetup-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CRYPTSETUP_DEV})) +$(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-selinux -post-install: +cryptsetup-install: ${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib ${CP} ${WRKINST}/usr/lib/libcryptsetup.so* \ ${IDIR_CRYPTSETUP}/usr/lib ${INSTALL_BIN} ${WRKINST}/usr/sbin/cryptsetup \ ${IDIR_CRYPTSETUP}/usr/sbin -cryptsetup-dev-install: - ${INSTALL_DIR} ${IDIR_CRYPTSETUP_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* \ - ${IDIR_CRYPTSETUP_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cups/Makefile b/package/cups/Makefile index 6a36d424a..adf8dcade 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cups PKG_VERSION:= 1.4.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 8776403ad60fea9e85eab9c04d88560d PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net/misc @@ -14,16 +14,13 @@ PKG_BUILDDEP:= zlib PKG_URL:= http://www.cups.org/ PKG_SITES:= ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/ PKG_NEED_CXX:= 1 +PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2 -PKG_SUBPKGS:= CUPS CUPS_DEV -PKGSC_CUPS_DEV:= devel - include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,CUPS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CUPS_DEV})) +$(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC' @@ -53,7 +50,7 @@ else XAKE_FLAGS+= OPTIM='-fPIC' endif -post-install: +cups-install: ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin ${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin ${INSTALL_DIR} ${IDIR_CUPS}/etc/cups @@ -84,8 +81,4 @@ post-install: ${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/ ${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/ -cups-dev-install: - ${INSTALL_DIR} ${IDIR_CUPS_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_CUPS_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/curl/Makefile b/package/curl/Makefile index 146a476b4..75fab01fa 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -13,13 +13,13 @@ PKG_DEPENDS:= libcurl PKG_BUILDDEP:= zlib PKG_URL:= http://curl.haxx.se/ PKG_SITES:= http://curl.haxx.se/download/ +PKG_LIBNAME:= libcurl +PKG_OPTS:= dev -PKG_SUBPKGS:= CURL LIBCURL LIBCURL_DEV +PKG_SUBPKGS:= CURL LIBCURL PKGSD_LIBCURL:= a client-side URL transfer library PKGSC_LIBCURL:= libs PKGSS_LIBCURL:= zlib -PKGSD_LIBCURL_DEV:= development files for libcurl -PKGSC_LIBCURL_DEV:= devel PKG_FLAVOURS_CURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support @@ -36,8 +36,7 @@ PKGCB_WITH_GNUTLS:= gnutls include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL})) -$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV})) +$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL},${PKG_OPTS})) ifeq (${ADK_PACKAGE_LIBCURL_WITHOUT_SSL},y) CONFIGURE_ARGS+= --without-ssl \ @@ -90,14 +89,4 @@ libcurl-install: ${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib ${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib -libcurl-dev-install: - ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/lib - ${CP} ${WRKINST}/usr/lib/libcurl.a ${IDIR_LIBCURL_DEV}/usr/lib - ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl - ${CP} ${WRKINST}/usr/include/curl/*.h \ - ${IDIR_LIBCURL_DEV}/usr/include/curl - ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/curl-config \ - ${IDIR_LIBCURL_DEV}/usr/bin - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 9470d8fb2..e72624b2e 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cxxtools PKG_VERSION:= 2.1.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 2026a2bb23b966f13893167b4dbc5d70 PKG_DESCR:= a collection of general-purpose C++ classes (libraries) PKG_SECTION:= libs @@ -15,17 +15,13 @@ PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ PKG_NEED_CXX:= 1 PKG_CXX:= CXXTOOLS +PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !arm !avr32 -PKG_SUBPKGS:= CXXTOOLS CXXTOOLS_DEV -PKGSC_CXXTOOLS_DEV:= devel -PKGSD_CXXTOOLS_DEV:= a collection of general-purpose C++ classes (headers) - include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,CXXTOOLS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) @@ -45,11 +41,4 @@ cxxtools-install: ${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib ${CP} ${WRKINST}/usr/lib/libcxxtools.so* ${IDIR_CXXTOOLS}/usr/lib -cxxtools-dev-install: - ${INSTALL_DIR} ${IDIR_CXXTOOLS_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* \ - ${IDIR_CXXTOOLS_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_CXXTOOLS_DEV}/usr/bin - ${CP} ${WRKINST}/usr/bin/cxxtools-config ${IDIR_CXXTOOLS_DEV}/usr/bin - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index 9fd2e6f8b..65169cf89 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cyrus-sasl PKG_VERSION:= 2.1.23 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 2eb0e48106f0e9cd8001e654f267ecbc PKG_DESCR:= a general purpose authentication library PKG_SECTION:= libs @@ -14,15 +14,12 @@ PKG_DEPENDS:= libopenssl PKG_URL:= http://asg.web.cmu.edu/sasl/ PKG_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/ PKG_NOPARALLEL:= 1 - -PKG_SUBPKGS:= LIBSASL2 LIBSASL2_DEV -PKGSD_LIBSASL2_DEV:= sasl2 headers -PKGSC_LIBSASL2_DEV:= devel +PKG_LIBNAME:= libsasl2 +PKG_OPTS:= dev include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBSASL2_DEV,libsasl2-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSASL2_DEV},${PKGSC_LIBSASL2_DEV})) +$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ARGS+= --enable-staticdlopen \ --enable-cram \ @@ -78,8 +75,4 @@ libsasl2-install: ${CP} ${WRKINST}/usr/lib/sasl2/lib*.so* \ ${IDIR_LIBSASL2}/usr/lib/sasl2 -libsasl2-dev-install: - ${INSTALL_DIR} ${IDIR_LIBSASL2_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBSASL2_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile index 4269c2ac2..44c809479 100644 --- a/package/damageproto/Makefile +++ b/package/damageproto/Makefile @@ -8,18 +8,12 @@ PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= bf8c47b7f48625230cff155180f8ddce PKG_DESCR:= X DAMAGE Extension headers -PKG_SECTION:= x11/devel +PKG_SECTION:= devel PKG_SITES:= ${MASTER_SITE_XORG} +PKG_OPTS:= dev devonly include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DAMAGEPROTO,damageproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -post-install: - ${INSTALL_DIR} ${IDIR_DAMAGEPROTO}/usr/include - ${CP} ${WRKINST}/usr/include/X11 ${IDIR_DAMAGEPROTO}/usr/include - ${INSTALL_DIR} ${IDIR_DAMAGEPROTO}/usr/lib/pkgconfig - ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/damageproto.pc \ - ${IDIR_DAMAGEPROTO}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/db/Makefile b/package/db/Makefile index 82d69ef64..3a65ba83d 100644 --- a/package/db/Makefile +++ b/package/db/Makefile @@ -5,24 +5,20 @@ include ${TOPDIR}/rules.mk PKG_NAME:= db PKG_VERSION:= 5.3.21 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 3fda0b004acdaa6fa350bfc41a3b95ca PKG_DESCR:= disk file format database which stores key/data-pairs in single files PKG_SECTION:= db PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db PKG_SITES:= http://www.openadk.org/distfiles/ PKG_NEED_CXX:= 1 - -PKG_SUBPKGS:= LIBDB LIBDB_DEV -PKGSC_LIBDB_DEV:= devel -PKGSD_LIBDB_DEV:= libdb headers +PKG_OPTS:= dev WRKBUILD= ${WRKSRC}/build_unix include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBDB_DEV,libdb-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBDB_DEV},${PKGSC_LIBDB_DEV})) +$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_PROG:= dist/configure @@ -45,8 +41,4 @@ libdb-install: ${INSTALL_DIR} ${IDIR_LIBDB}/usr/lib ${CP} ${WRKINST}/usr/lib/libdb*.so ${IDIR_LIBDB}/usr/lib -libdb-dev-install: - ${INSTALL_DIR} ${IDIR_LIBDB_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBDB_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile index a937f5971..204c66f50 100644 --- a/package/dbus-glib/Makefile +++ b/package/dbus-glib/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dbus-glib PKG_VERSION:= 0.86 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= cd0ab148fb0c786fc88be49d19971f50 PKG_DESCR:= DBUS glib bindings PKG_SECTION:= libs @@ -13,15 +13,11 @@ PKG_DEPENDS:= dbus glib PKG_BUILDDEP:= dbus glib PKG_URL:= http://www.freedesktop.org/wiki/Software/DBusBindings PKG_SITES:= http://dbus.freedesktop.org/releases/dbus-glib/ - -PKG_SUBPKGS:= DBUS_GLIB DBUS_GLIB_DEV -PKGSC_DBUS_GLIB_DEV:= devel -PKGSD_DBUS_GLIB_DEV:= dbus-glib headers +PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DBUS_GLIB_DEV,dbus-glib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_GLIB_DEV},${PKGSC_DBUS_GLIB_DEV})) +$(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-checks @@ -32,15 +28,4 @@ dbus-glib-install: $(CP) $(WRKINST)/usr/lib/libdbus-glib-1.so* \ $(IDIR_DBUS_GLIB)/usr/lib -dbus-glib-dev-install: - $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/include - $(CP) $(WRKINST)/usr/include/* \ - $(IDIR_DBUS_GLIB_DEV)/usr/include - $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig - ${CP} $(WRKINST)/usr/lib/pkgconfig/*.pc \ - $(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig - $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/dbus-binding-tool \ - $(IDIR_DBUS_GLIB_DEV)/usr/bin - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dbus/Makefile b/package/dbus/Makefile index de0ed663c..7f7f5707f 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dbus PKG_VERSION:= 1.6.12 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= a70edc50524f258eaf5c9a9994ed8748 PKG_DESCR:= DBUS library and daemon PKG_SECTION:= libs @@ -13,19 +13,15 @@ PKG_DEPENDS:= libexpat libx11 libuuid PKG_BUILDDEP:= expat libX11 util-linux PKG_URL:= http://dbus.freedesktop.org/ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ - -PKG_SUBPKGS:= DBUS DBUS_DEV -PKGSC_DBUS_DEV:= devel -PKGSD_DBUS_DEV:= DBUS headers +PKG_OPTS:= dev ifeq ($(ADK_STATIC),y) -PKG_OPTS:= libonly +PKG_OPTS+= libonly endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS})) TARGET_LDFLAGS+= -luuid TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) @@ -56,15 +52,10 @@ dbus-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-uuidgen ${IDIR_DBUS}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-send ${IDIR_DBUS}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-monitor ${IDIR_DBUS}/usr/bin - -dbus-dev-install: - ${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_DBUS_DEV}/usr/include + # workaround for dev subpackage ${INSTALL_DIR} $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus - ${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/lib/pkgconfig - ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ - ${IDIR_DBUS_DEV}/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile index 0083b5abf..402144bfd 100644 --- a/package/dri2proto/Makefile +++ b/package/dri2proto/Makefile @@ -8,18 +8,12 @@ PKG_VERSION:= 2.6 PKG_RELEASE:= 1 PKG_MD5SUM:= 873142af5db695537cfe05e01d13541f PKG_DESCR:= DRI protocol headers -PKG_SECTION:= x11/devel +PKG_SECTION:= devel PKG_SITES:= ${MASTER_SITE_XORG} +PKG_OPTS:= dev devonly include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DRI2PROTO,dri2proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -post-install: - ${INSTALL_DIR} ${IDIR_DRI2PROTO}/usr/include - ${CP} ${WRKINST}/usr/include/X11 ${IDIR_DRI2PROTO}/usr/include - ${INSTALL_DIR} ${IDIR_DRI2PROTO}/usr/lib/pkgconfig - ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/dri2proto.pc \ - ${IDIR_DRI2PROTO}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 80dad73aa..a04bd9649 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs PKG_VERSION:= 1.42.8 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 8ef664b6eb698aa6b733df59b17b9ed4 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= fs @@ -13,22 +13,18 @@ PKG_DEPENDS:= libcom-err libuuid libblkid libpthread PKG_BUILDDEP:= util-linux PKG_URL:= http://e2fsprogs.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} +PKG_OPTS:= dev PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF PKG_SUBPKGS:= LIBE2FS LIBCOM_ERR LIBSS E2FSCK_STATIC -PKG_SUBPKGS+= LIBCOM_ERR_DEV LIBSS_DEV PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS PKGSD_LIBE2FS:= e2fsprogs library PKGSC_LIBE2FS:= libs PKGSD_LIBCOM_ERR:= Common error library PKGSC_LIBCOM_ERR:= libs -PKGSD_LIBCOM_ERR_DEV:= Common error headers -PKGSC_LIBCOM_ERR_DEV:= devel PKGSD_LIBSS:= Subsystem command parsing library PKGSC_LIBSS:= libs -PKGSD_LIBSS_DEV:= Subsystem command parsing headers -PKGSC_LIBSS_DEV:= devel PKGSD_E2FSCK_STATIC:= Static build of e2fsck PKGSC_E2FSCK_STATIC:= fs PKGSD_RESIZE2FS:= Resize FS utility @@ -46,11 +42,11 @@ PKGSS_MKE2FS:= libe2fs include ${TOPDIR}/mk/package.mk +$(eval $(call PKG_template,E2FSPROGS,e2fsprogs,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS})) $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR})) $(eval $(call PKG_template,LIBCOM_ERR_DEV,libcom-err-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR_DEV},${PKGSC_LIBCOM_ERR_DEV})) $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS})) -$(eval $(call PKG_template,LIBSS_DEV,libss-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS_DEV},${PKGSC_LIBSS_DEV})) $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC})) $(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS})) $(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_RESIZE2FS),${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS})) @@ -75,6 +71,11 @@ ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),) ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin endif +e2fsprogs-install: + # workaround for dev subpackage + ${CP} ${WRKINST}/usr/bin/compile_et \ + ${IDIR_E2FSPROGS_DEV}/usr/bin + libe2fs-install: ${INSTALL_DIR} ${IDIR_LIBE2FS}/etc ${INSTALL_DATA} ${WRKBUILD}/misc/mke2fs.conf ${IDIR_LIBE2FS}/etc @@ -105,25 +106,12 @@ libcom-err-install: ${IDIR_LIBCOM_ERR}/usr/lib ${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_HOST_DIR}/bin -libcom-err-dev-install: - ${INSTALL_DIR} ${IDIR_LIBCOM_ERR_DEV}/usr/include/et - ${CP} ${WRKINST}/usr/include/et/com_err.h \ - ${IDIR_LIBCOM_ERR_DEV}/usr/include/et - ${INSTALL_DIR} ${IDIR_LIBCOM_ERR_DEV}/usr/bin - ${CP} ${WRKINST}/usr/bin/compile_et \ - ${IDIR_LIBCOM_ERR_DEV}/usr/bin - libss-install: ${INSTALL_DIR} ${IDIR_LIBSS}/usr/lib ${CP} ${WRKINST}/usr/lib/libss.so* \ ${IDIR_LIBSS}/usr/lib ${CP} ${WRKINST}/usr/bin/mk_cmds ${STAGING_HOST_DIR}/bin -libss-dev-install: - ${INSTALL_DIR} ${IDIR_LIBSS_DEV}/usr/include/ss - ${CP} ${WRKINST}/usr/include/ss/ss*.h \ - ${IDIR_LIBSS_DEV}/usr/include/ss - e2fsck-static-install: ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),) ${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual index fd6d6fbb8..da237f79e 100644 --- a/package/eglibc/Config.in.manual +++ b/package/eglibc/Config.in.manual @@ -15,12 +15,3 @@ config ADK_PACKAGE_EGLIBC_STATIC depends on ADK_TARGET_LIB_EGLIBC help embedded GNU C library (static version). - -config ADK_PACKAGE_EGLIBC_DEV - prompt "eglibc-dev........... C library development files" - tristate - default n - depends on ADK_TARGET_LIB_EGLIBC - help - embedded GNU C library header files. - diff --git a/package/expat/Makefile b/package/expat/Makefile index 0ff841f4c..c5f676d3d 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -5,32 +5,24 @@ include ${TOPDIR}/rules.mk PKG_NAME:= expat PKG_VERSION:= 2.0.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= ee8b492592568805593f81f8cdf2a04c PKG_DESCR:= a XML parsing library PKG_SECTION:= libs PKG_URL:= http://expat.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} - -PKG_SUBPKGS:= LIBEXPAT LIBEXPAT_DEV -PKGSD_LIBEXPAT_DEV:= development files for expat -PKGSC_LIBEXPAT_DEV:= devel +PKG_OPTS:= dev ifeq ($(ADK_STATIC),y) -PKG_OPTS:= libonly +PKG_OPTS+= libonly endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,LIBEXPAT_DEV,libexpat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEXPAT_DEV},${PKGSC_LIBEXPAT_DEV})) -post-install: +libexpat-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/ -libexpat-dev-install: - ${INSTALL_DIR} ${IDIR_LIBEXPAT_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBEXPAT_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/faac/Makefile b/package/faac/Makefile index b54a35ac0..df407dbe4 100644 --- a/package/faac/Makefile +++ b/package/faac/Makefile @@ -11,12 +11,12 @@ PKG_DESCR:= AAC encoder PKG_SECTION:= libs PKG_URL:= http://www.audiocoding.com/faac.html PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/} - -PKG_SUBPKGS:= LIBFAAC +PKG_LIBNAME:= libfaac +PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBFAAC,libfaac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBFAAC,libfaac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ARGS+= --without-mp4v2 diff --git a/package/faad2/Makefile b/package/faad2/Makefile index 9d2be1fe8..611f5ed9a 100644 --- a/package/faad2/Makefile +++ b/package/faad2/Makefile @@ -11,12 +11,12 @@ PKG_DESCR:= A MP4 decoding library PKG_SECTION:= libs PKG_URL:= http://sourceforge.net/projects/faac/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/} - -PKG_SUBPKGS:= LIBFAAD2 +PKG_LIBNAME:= libfaad2 +PKG_OPTS:= dev include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) # check for lrintf fails on Darwin, don't know why @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --without-mpeg4ip \ --without-xmms TARGET_LDFLAGS+= -lm -post-inst