Changeset a190a80 in freewrt for tools


Ignore:
Timestamp:
Jul 20, 2006, 8:38:56 PM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
6977d0e
Parents:
8d05332
Message:

fix tools directory, after changing WRKDIR, repack lzma package, i hate packages without subdirectory, cleanup makefiles

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@300 afb5a338-a214-0410-bd46-81f09a774fd1

Location:
tools
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • tools/lzma/Makefile

    r8d05332 ra190a80  
    44include ../rules.mk
    55
    6 WRKDIR=$(TOOLS_BUILD_DIR)/lzma
    7 PKG_SOURCE=lzma432.tar.bz2
    8 LZMA_SITE=@SF/sevenzip
    9 LZMA_MD5=155c1ebce5bc6710ae7ecc926226d9d7
     6PKG_NAME:=              lzma
     7PKG_VERSION:=           432
     8PKG_MD5SUM:=            d3a40c06de82db6601ae565ba6cd618a
     9PKG_SOURCE_URL:=        @SF/sevenzip
     10PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.bz2
     11PKG_BUILD_DIR:=         $(TOOLS_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    1012
    11 LZMA_LIB_DIR=$(WRKDIR)/C/7zip/Compress/LZMA_Lib
    12 LZMA_ALONE_DIR=$(WRKDIR)/C/7zip/Compress/LZMA_Alone
     13LZMA_LIB_DIR=           $(PKG_BUILD_DIR)/C/7zip/Compress/LZMA_Lib
     14LZMA_ALONE_DIR=         $(PKG_BUILD_DIR)/C/7zip/Compress/LZMA_Alone
    1315
    14 TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
     16TARGETS=                $(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
    1517
    1618$(DL_DIR)/$(PKG_SOURCE):
    17         $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE)
     19        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(MAKE_TRACE)
    1820
    19 $(WRKDIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
     21$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
    2022        ${EXTRACT_CMD}
    21         patch -d $(WRKDIR) -p1 < lzma-zlib.patch $(MAKE_TRACE)
    22         touch $(WRKDIR)/.unpacked
     23        $(PATCH) $(PKG_BUILD_DIR) patches/ \*.patch
     24        touch $@
    2325       
    24 $(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(WRKDIR)/.built
    25 $(WRKDIR)/.built: $(WRKDIR)/.unpacked
     26$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(PKG_BUILD_DIR)/.built
     27$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.unpacked
    2628        $(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
    2729        $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
    … …  
    2931
    3032lzma: $(TARGETS)
    31         $(CP) $^ $(WRKDIR)
     33        $(CP) $^ $(PKG_BUILD_DIR)
    3234
    3335lzma-source: $(DL_DIR)/$(PKG_SOURCE)
    … …  
    3638        -$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE)
    3739        -$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE)
    38         rm -f $(WRKDIR)/liblzma.a $(WRKDIR)/lzma
     40        rm -f $(PKG_BUILD_DIR)/liblzma.a $(PKG_BUILD_DIR)/lzma
    3941
    4042lzma-dirclean:
    41         rm -rf $(WRKDIR)
     43        rm -rf $(PKG_BUILD_DIR)
    4244
    4345#############################################################
    4446
    45 prepare: $(WRKDIR)/.unpacked
     47prepare: $(PKG_BUILD_DIR)/.unpacked
    4648compile: lzma
    4749install: lzma
    48         $(CP) $(WRKDIR)/lzma $(STAGING_DIR)/bin/
     50        $(CP) $(PKG_BUILD_DIR)/lzma $(STAGING_DIR)/bin/
    4951clean: lzma-dirclean

  • tools/rules.mk

    r8d05332 ra190a80  
    11# $FreeWRT$
    22
    3 WRKDIR?=        ${TOOLS_BUILD_DIR}
     3WRKDIR?=        ${PKG_BUILD_DIR}
    44DISTFILES?=     ${DL_DIR}/${PKG_SOURCE}

  • tools/sed/Makefile

    r8d05332 ra190a80  
    44include ../rules.mk
    55
    6 SED_VER:=4.1.2
    7 PKG_SOURCE:=sed-$(SED_VER).tar.gz
    8 SED_SITE:=ftp://ftp.gnu.org/gnu/sed
    9 SED_MD5SUM:=928f0e06422f414091917401f1a834d0
    10 
    11 SED_CAT:=zcat
    12 SED_DIR:=$(TOOLS_BUILD_DIR)/sed-$(SED_VER)
    13 SED_BINARY:=sed/sed
    14 SED_TARGET_BINARY:=bin/sed
    15 SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64
     6PKG_NAME:=              sed
     7PKG_VERSION:=           4.1.2
     8PKG_RELEASE:=           1
     9PKG_MD5SUM:=            928f0e06422f414091917401f1a834d0
     10PKG_SOURCE_URL:=        ftp://ftp.gnu.org/gnu/sed
     11PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
     12PKG_BUILD_DIR:=         $(TOOLS_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
     13PKG_BINARY:=            sed/sed
     14PKG_TARGET_BINARY:=     bin/sed
    1615
    1716$(DL_DIR)/$(PKG_SOURCE):
    18         mkdir -p $(DL_DIR)
    19         $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(SED_MD5SUM) $(SED_SITE)
     17        @mkdir -p $(DL_DIR)
     18        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
    2019
    21 $(SED_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
    22         mkdir -p $(STAGING_DIR)/bin
     20$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
     21        @mkdir -p $(STAGING_DIR)/bin
    2322        ${EXTRACT_CMD}
    2423        touch $@
    2524
    26 $(SED_DIR)/.configured: $(SED_DIR)/.unpacked
    27         (cd $(SED_DIR); rm -rf config.cache; \
     25$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
     26        (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
    2827                ac_cv_header_wctype_h=no \
    2928                ./configure \
    … …  
    3433        touch $@
    3534
    36 $(SED_DIR)/$(SED_BINARY): $(SED_DIR)/.configured
    37         $(MAKE) -C $(SED_DIR)
     35$(PKG_BUILD_DIR)/$(PKG_BINARY): $(PKG_BUILD_DIR)/.configured
     36        $(MAKE) -C $(PKG_BUILD_DIR)
    3837
    3938# This stuff is needed to work around GNU make deficiencies
    40 build-sed-host-binary: $(SED_DIR)/$(SED_BINARY)
    41         @if [ -L $(STAGING_DIR)/$(SED_TARGET_BINARY) ] ; then \
    42                 rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); fi;
    43         @if [ ! -f $(STAGING_DIR)/$(SED_TARGET_BINARY) -o $(STAGING_DIR)/$(SED_TARGET_BINARY) \
    44         -ot $(SED_DIR)/$(SED_BINARY) ] ; then \
     39build-sed-host-binary: $(PKG_BUILD_DIR)/$(PKG_BINARY)
     40        @if [ -L $(STAGING_DIR)/$(PKG_TARGET_BINARY) ] ; then \
     41                rm -f $(STAGING_DIR)/$(PKG_TARGET_BINARY); fi;
     42        @if [ ! -f $(STAGING_DIR)/$(PKG_TARGET_BINARY) -o $(STAGING_DIR)/$(PKG_TARGET_BINARY) \
     43        -ot $(PKG_BUILD_DIR)/$(PKG_BINARY) ] ; then \
    4544            set -x; \
    4645            mkdir -p $(STAGING_DIR)/bin; \
    47             $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR) install; \
     46            $(MAKE) DESTDIR=$(STAGING_DIR) -C $(PKG_BUILD_DIR) install; \
    4847            mv $(STAGING_DIR)/usr/bin/sed $(STAGING_DIR)/bin/; \
    4948            rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
    5049                    $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi
    51         @ln -sf $(STAGING_DIR)/$(SED_TARGET_BINARY) $(TOPDIR)/lbin/sed
     50        @ln -sf $(STAGING_DIR)/$(PKG_TARGET_BINARY) $(TOPDIR)/lbin/sed
    5251
    5352use-sed-host-binary:
    … …  
    5554            if [ -x /bin/sed ]; then SED="/bin/sed"; fi; fi; \
    5655            mkdir -p $(STAGING_DIR)/bin; \
    57             rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); \
    58             ln -s $$SED $(STAGING_DIR)/$(SED_TARGET_BINARY)
     56            rm -f $(STAGING_DIR)/$(PKG_TARGET_BINARY); \
     57            ln -s $$SED $(STAGING_DIR)/$(PKG_TARGET_BINARY)
    5958
    6059source:
    … …  
    6362install: build-sed-host-binary
    6463clean:
    65         rm -rf $(SED_DIR)
    66         rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY)
    67 
     64        rm -rf $(PKG_BUILD_DIR)
     65        rm -f $(STAGING_DIR)/$(PKG_TARGET_BINARY)

  • tools/squashfs/Makefile

    r8d05332 ra190a80  
    44include ../rules.mk
    55
    6 PKG_NAME:=squashfs
    7 PKG_VERSION:=3.0
    8 PKG_MD5SUM:=9fd05d0bfbb712f5fb95edafea5bc733
    9 
    10 PKG_BUILD_DIR:=$(TOOLS_BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)
    11 PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.gz
    12 PKG_SOURCE_URL:=@SF/squashfs
     6PKG_NAME:=              squashfs
     7PKG_VERSION:=           3.0
     8PKG_MD5SUM:=            9fd05d0bfbb712f5fb95edafea5bc733
     9PKG_BUILD_DIR:=         $(TOOLS_BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)
     10PKG_SOURCE:=            $(PKG_NAME)$(PKG_VERSION).tar.gz
     11PKG_SOURCE_URL:=        @SF/squashfs
    1312
    1413$(DL_DIR)/$(PKG_SOURCE):
    … …  
    2423        $(MAKE) CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \
    2524            -C $(PKG_BUILD_DIR)/squashfs-tools \
    26             mksquashfs-lzma LZMAPATH=$(TOOLS_BUILD_DIR)/lzma
     25            mksquashfs-lzma LZMAPATH=$(TOOLS_BUILD_DIR)/lzma-432
    2726
    2827$(STAGING_DIR)/bin/mksquashfs-lzma: $(PKG_BUILD_DIR)/squashfs-tools/mksquashfs-lzma
Note: See TracChangeset for help on using the changeset viewer.