From 75c0740b727b5e7ab7dc041797265831ed91df4e Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 17 Dec 2006 17:03:50 +0000 Subject: [PATCH] - Remove uuid unit from build. Calculating cryptograhic hashes has nothing to do with networking, so should not depend on sockets. Further, we already have a uuid package for calculating uuids. git-svn-id: trunk@5626 - --- packages/base/hash/Makefile | 160 +++++++++----------------------- packages/base/hash/Makefile.fpc | 2 +- 2 files changed, 45 insertions(+), 117 deletions(-) diff --git a/packages/base/hash/Makefile b/packages/base/hash/Makefile index 5b1cd0aebb..96588b1534 100644 --- a/packages/base/hash/Makefile +++ b/packages/base/hash/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/12/16] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/12/01] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded powerpc64-linux powerpc64-embedded +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -233,151 +233,127 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext override PACKAGE_NAME=hash override PACKAGE_VERSION=2.0.0 ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=md5 crc ntlm uuid unixcrypt +override TARGET_UNITS+=md5 crc ntlm unixcrypt endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=md5 crc ntlm uuid -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=md5 crc ntlm uuid unixcrypt +override TARGET_UNITS+=md5 crc ntlm unixcrypt endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=md5 crc ntlm uuid -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=md5 crc ntlm uuid unixcrypt +override TARGET_UNITS+=md5 crc ntlm unixcrypt endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=md5 crc ntlm uuid -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=md5 crc ntlm uuid unixcrypt +override TARGET_UNITS+=md5 crc ntlm unixcrypt endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=md5 crc ntlm uuid -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=md5 crc ntlm uuid unixcrypt +override TARGET_UNITS+=md5 crc ntlm unixcrypt endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=md5 crc ntlm uuid -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=md5 crc ntlm uuid unixcrypt +override TARGET_UNITS+=md5 crc ntlm unixcrypt endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=md5 crc ntlm uuid -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=md5 crc ntlm uuid -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=md5 crc ntlm uuid unixcrypt -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=md5 crc ntlm uuid +override TARGET_UNITS+=md5 crc ntlm unixcrypt endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=md5test @@ -430,9 +406,6 @@ endif ifeq ($(FULL_TARGET),i386-wince) override TARGET_EXAMPLES+=md5test endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_EXAMPLES+=md5test -endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_EXAMPLES+=md5test endif @@ -454,9 +427,6 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_EXAMPLES+=md5test endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_EXAMPLES+=md5test -endif ifeq ($(FULL_TARGET),powerpc-linux) override TARGET_EXAMPLES+=md5test endif @@ -475,9 +445,6 @@ endif ifeq ($(FULL_TARGET),powerpc-morphos) override TARGET_EXAMPLES+=md5test endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_EXAMPLES+=md5test -endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLES+=md5test endif @@ -487,9 +454,6 @@ endif ifeq ($(FULL_TARGET),sparc-solaris) override TARGET_EXAMPLES+=md5test endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_EXAMPLES+=md5test -endif ifeq ($(FULL_TARGET),x86_64-linux) override TARGET_EXAMPLES+=md5test endif @@ -499,9 +463,6 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=md5test endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_EXAMPLES+=md5test -endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_EXAMPLES+=md5test endif @@ -514,18 +475,9 @@ endif ifeq ($(FULL_TARGET),arm-gba) override TARGET_EXAMPLES+=md5test endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_EXAMPLES+=md5test -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_EXAMPLES+=md5test -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=md5test endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_EXAMPLES+=md5test -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1322,9 +1274,6 @@ endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i386-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1346,9 +1295,6 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),m68k-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1367,9 +1313,6 @@ endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1379,9 +1322,6 @@ endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),sparc-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1391,9 +1331,6 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1406,18 +1343,9 @@ endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-nds) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),arm-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1495,7 +1423,7 @@ ifeq ($(CPU_TARGET),powerpc) FPCCPUOPT:=-O1r endif else -FPCCPUOPT:=-O2 +FPCCPUOPT:=-O1r endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE diff --git a/packages/base/hash/Makefile.fpc b/packages/base/hash/Makefile.fpc index 8b500e61b5..23fc14478c 100644 --- a/packages/base/hash/Makefile.fpc +++ b/packages/base/hash/Makefile.fpc @@ -7,7 +7,7 @@ name=hash version=2.0.0 [target] -units=md5 crc ntlm uuid +units=md5 crc ntlm units_linux=unixcrypt examples=md5test