pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
kbuild: removed, used for updating devel/kbuild
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Tue Jan 2 11:38:27 2018 +0100
Changeset: 9c33bbde0287b2ccdfe282b99ce511a5b5d063b5
Modified Files:
Makefile
Removed Files:
kbuild/DESCR
kbuild/Makefile
kbuild/PLIST
kbuild/distinfo
kbuild/files/SvnInfo.kmk
kbuild/patches/patch-kBuild_header.kmk
kbuild/patches/patch-src_kmk_Makefile.kmk
kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c
kbuild/patches/patch-src_sed_lib_utils.c
Log Message:
kbuild: removed, used for updating devel/kbuild
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9c33bbde0287b2ccdfe282b99ce511a5b5d063b5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
kbuild/DESCR | 1 -
kbuild/Makefile | 88 --------------
kbuild/PLIST | 146 ------------------------
kbuild/distinfo | 10 --
kbuild/files/SvnInfo.kmk | 2 -
kbuild/patches/patch-kBuild_header.kmk | 35 ------
kbuild/patches/patch-src_kmk_Makefile.kmk | 22 ----
kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c | 18 ---
kbuild/patches/patch-src_sed_lib_utils.c | 15 ---
10 files changed, 338 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 7ed10eaeb8..b296ee8227 100644
--- a/Makefile
+++ b/Makefile
@@ -1551,7 +1551,6 @@ SUBDIR+= kahakai
SUBDIR+= kallisto
SUBDIR+= kannel-gateway
SUBDIR+= kawa
-SUBDIR+= kbuild
SUBDIR+= kcalc
SUBDIR+= kde-baseapps4
SUBDIR+= kde-cli-tools
diff --git a/kbuild/DESCR b/kbuild/DESCR
deleted file mode 100644
index e42b9bf5e0..0000000000
--- a/kbuild/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-kBuild is a makefile framework for writing simple makefiles for complex tasks.
diff --git a/kbuild/Makefile b/kbuild/Makefile
deleted file mode 100644
index 4d7c92fc99..0000000000
--- a/kbuild/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2016/07/08 09:42:53 kamil Exp $
-
-KBUILDNAME= kBuild
-KBUILDVERMAJ= 0.1.9998
-KBUILDVERMIN= 8
-KBUILDVERSVN= 3127
-KBUILDVERFDR= 25
-
-DISTNAME= ${KBUILDNAME}-r${KBUILDVERSVN}
-PKGNAME= ${KBUILDNAME:tl}-${KBUILDVERMAJ}.${KBUILDVERMIN}.r${KBUILDVERSVN}
-CATEGORIES= devel
-MASTER_SITES= http://svn.netlabs.org/repos/kbuild/trunk
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://trac.netlabs.org/kbuild/wiki/WikiStart
-COMMENT= Framework for writing simple makefiles for complex tasks
-# but also various other licenses in 3rd party code
-LICENSE= gnu-gpl-v3
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
-MAKE_JOBS_SAFE= no
-
-USE_TOOLS+= pax lex gmake autoconf autoreconf automake autopoint perl
-
-KBUILD_VERSION_PATCH= ${KBUILDVERMAJ:E}
-
-INSTALL_ENV+= KBUILD_VERBOSE=2
-
-MAKE_ENV+= KBUILD_LIB_SEARCH_PATHS="/lib /usr/lib ${X11BASE}/lib ${PREFIX}/lib"
-
-LDFLAGS+= -lutil
-# honor CFLAGS and LDFLAGS
-MAKE_ENV+= TEMPLATE_BIN-KMK_CFLAGS=${CFLAGS:Q}
-MAKE_ENV+= TEMPLATE_BIN-KMK_LDFLAGS=${LDFLAGS:Q}
-MAKE_ENV+= TEMPLATE_BIN_CFLAGS=${CFLAGS:Q}
-MAKE_ENV+= TEMPLATE_BIN_LDFLAGS=${LDFLAGS:Q}
-
-INSTALL_ENV+= TEMPLATE_BIN_CFLAGS=${CFLAGS:Q}
-INSTALL_ENV+= TEMPLATE_BIN_LDFLAGS=${LDFLAGS:Q}
-INSTALL_ENV+= TEMPLATE_BIN-THREADED_CFLAGS=${CFLAGS:Q}
-INSTALL_ENV+= TEMPLATE_BIN-THREADED_LDFLAGS=${LDFLAGS:Q}
-INSTALL_ENV+= kObjCache_LDFLAGS=${LDFLAGS:Q}
-INSTALL_ENV+= kDepPre_LDFLAGS=${LDFLAGS:Q}
-INSTALL_ENV+= kmk_sed_LDFLAGS=${LDFLAGS:Q}
-INSTALL_ENV+= kmk_time_LDFLAGS=${LDFLAGS:Q}
-
-.PHONY: fetch-with-svn
-fetch-with-svn:
- ${MKDIR} ${WRKDIR}; \
- cd ${WRKDIR}; \
- svn export -r${KBUILDVERSVN} ${MASTER_SITES}; \
- ${MV} trunk ${DISTNAME}; \
- tar czf ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}; \
- ${MV} ${DISTNAME}${EXTRACT_SUFX} ${DISTDIR}; \
- ${ECHO} do not forget to run "make makesum"
-
-post-extract:
- ${RUN} ${CP} ${FILESDIR}/SvnInfo.kmk ${WRKSRC}/
-
-pre-build:
-# Remove prebuilt files
- ${RUN} cd ${WRKSRC} && rm -rf kBuild/bin/*
-
-do-build:
- ${RUN} cd ${WRKSRC} && \
- ${SETENV} ${MAKE_ENV} ./kBuild/env.sh \
- --full ${GMAKE} -f bootstrap.gmk \
- KBUILD_VERBOSE=2 \
- KBUILD_VERSION_PATCH=${KBUILD_VERSION_PATCH} && \
- ${SETENV} ${MAKE_ENV} ./kBuild/env.sh kmk \
- NIX_INSTALL_DIR=${PREFIX} \
- BUILD_TYPE=release \
- MY_INST_MODE=${NONBINMODE} \
- MY_INST_BIN_MODE=${BINMODE} \
- rebuild
-
-do-install:
- ${RUN} cd ${WRKSRC} && \
- ${SETENV} ${INSTALL_ENV} ./kBuild/env.sh kmk \
- NIX_INSTALL_DIR=${PREFIX} \
- BUILD_TYPE=release \
- MY_INST_MODE=${NONBINMODE} \
- MY_INST_BIN_MODE=${BINMODE} \
- PATH_INS=${DESTDIR} \
- install
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/kbuild/PLIST b/kbuild/PLIST
deleted file mode 100644
index e630596ac9..0000000000
--- a/kbuild/PLIST
+++ /dev/null
@@ -1,146 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2016/07/08 09:42:53 kamil Exp $
-bin/kDepIDB
-bin/kDepObj
-bin/kDepPre
-bin/kObjCache
-bin/kmk
-bin/kmk_append
-bin/kmk_ash
-bin/kmk_cat
-bin/kmk_chmod
-bin/kmk_cmp
-bin/kmk_cp
-bin/kmk_echo
-bin/kmk_expr
-bin/kmk_gmake
-bin/kmk_install
-bin/kmk_ln
-bin/kmk_md5sum
-bin/kmk_mkdir
-bin/kmk_mv
-bin/kmk_printf
-bin/kmk_redirect
-bin/kmk_rm
-bin/kmk_rmdir
-bin/kmk_sed
-bin/kmk_sleep
-bin/kmk_test
-bin/kmk_time
-bin/kmk_touch
-share/doc/kBuild-0.1.9998/QuickReference-kBuild.txt
-share/doc/kBuild-0.1.9998/QuickReference-kmk.html
-share/doc/kBuild-0.1.9998/QuickReference-kmk.txt
-share/kBuild/footer-inherit-uses-tools.kmk
-share/kBuild/footer-misc.kmk
-share/kBuild/footer-pass1.kmk
-share/kBuild/footer-pass2-compiling-targets.kmk
-share/kBuild/footer-pass2-fetches.kmk
-share/kBuild/footer-pass2-installs.kmk
-share/kBuild/footer-pass2-patches.kmk
-share/kBuild/footer-passes.kmk
-share/kBuild/footer.kmk
-share/kBuild/header.kmk
-share/kBuild/msgstyles/brief.kmk
-share/kBuild/msgstyles/brief2.kmk
-share/kBuild/rules.kmk
-share/kBuild/sdks/DXSDK.kmk
-share/kBuild/sdks/DXSDKAMD64.kmk
-share/kBuild/sdks/DXSDKX86.kmk
-share/kBuild/sdks/LIBSDL.kmk
-share/kBuild/sdks/MACOSX104.kmk
-share/kBuild/sdks/MACOSX104INCS.kmk
-share/kBuild/sdks/MACOSX105.kmk
-share/kBuild/sdks/MACOSX105INCS.kmk
-share/kBuild/sdks/NT4DDK.kmk
-share/kBuild/sdks/OS2DDKBASE32.kmk
-share/kBuild/sdks/ReorderCompilerIncs.kmk
-share/kBuild/sdks/W2K3DDK.kmk
-share/kBuild/sdks/W2K3DDKAMD64.kmk
-share/kBuild/sdks/W2K3DDKX86.kmk
-share/kBuild/sdks/W32API.kmk
-share/kBuild/sdks/WIN32SDK.kmk
-share/kBuild/sdks/WIN32SDK2002.kmk
-share/kBuild/sdks/WIN64SDK.kmk
-share/kBuild/sdks/WINDDK.kmk
-share/kBuild/sdks/WINDDK71.kmk
-share/kBuild/sdks/WINDDK71WLH.kmk
-share/kBuild/sdks/WINDDK71WNET.kmk
-share/kBuild/sdks/WINDDK71WXP.kmk
-share/kBuild/sdks/WINDDK80.kmk
-share/kBuild/sdks/WINDDK80W8.kmk
-share/kBuild/sdks/WINDDKW2K.kmk
-share/kBuild/sdks/WINDDKWLH.kmk
-share/kBuild/sdks/WINDDKWNET.kmk
-share/kBuild/sdks/WINDDKWXP.kmk
-share/kBuild/sdks/WINPSDK.kmk
-share/kBuild/sdks/WINPSDK71.kmk
-share/kBuild/sdks/WINPSDK71INCS.kmk
-share/kBuild/sdks/WINPSDKINCS.kmk
-share/kBuild/subfooter.kmk
-share/kBuild/subheader.kmk
-share/kBuild/templates/DUMMY.kmk
-share/kBuild/tools/ALP.kmk
-share/kBuild/tools/BISON.kmk
-share/kBuild/tools/FLEX.kmk
-share/kBuild/tools/GCC.kmk
-share/kBuild/tools/GCC3.kmk
-share/kBuild/tools/GCC32.kmk
-share/kBuild/tools/GCC3OMF.kmk
-share/kBuild/tools/GCC3PLAIN.kmk
-share/kBuild/tools/GCC42MACHO.kmk
-share/kBuild/tools/GCC4MACHO.kmk
-share/kBuild/tools/GCC64.kmk
-share/kBuild/tools/GXX.kmk
-share/kBuild/tools/GXX3.kmk
-share/kBuild/tools/GXX32.kmk
-share/kBuild/tools/GXX3OMF.kmk
-share/kBuild/tools/GXX3PLAIN.kmk
-share/kBuild/tools/GXX42MACHO.kmk
-share/kBuild/tools/GXX4MACHO.kmk
-share/kBuild/tools/GXX64.kmk
-share/kBuild/tools/JWASM.kmk
-share/kBuild/tools/LLVMGCC42MACHO.kmk
-share/kBuild/tools/LLVMGXX42MACHO.kmk
-share/kBuild/tools/MASM510.kmk
-share/kBuild/tools/MASM600.kmk
-share/kBuild/tools/MASM610.kmk
-share/kBuild/tools/MASM6PLUS.kmk
-share/kBuild/tools/MASM710.kmk
-share/kBuild/tools/MINGW32.kmk
-share/kBuild/tools/MINGWW64.kmk
-share/kBuild/tools/MSLINK510.kmk
-share/kBuild/tools/NASM.kmk
-share/kBuild/tools/OPENWATCOM-16.kmk
-share/kBuild/tools/OPENWATCOM-WL.kmk
-share/kBuild/tools/OPENWATCOM.kmk
-share/kBuild/tools/StandardDTrace.kmk
-share/kBuild/tools/TAR.kmk
-share/kBuild/tools/TARBZ2.kmk
-share/kBuild/tools/TARGZ.kmk
-share/kBuild/tools/VAC308.kmk
-share/kBuild/tools/VCC100.kmk
-share/kBuild/tools/VCC100AMD64.kmk
-share/kBuild/tools/VCC100X86.kmk
-share/kBuild/tools/VCC120.kmk
-share/kBuild/tools/VCC120AMD64.kmk
-share/kBuild/tools/VCC120X86.kmk
-share/kBuild/tools/VCC70.kmk
-share/kBuild/tools/VCC80.kmk
-share/kBuild/tools/VCC80AMD64.kmk
-share/kBuild/tools/VCC80X86.kmk
-share/kBuild/tools/WATCOMC11C-16.kmk
-share/kBuild/tools/WATCOMC11C-WL.kmk
-share/kBuild/tools/WATCOMC11C.kmk
-share/kBuild/tools/WGET.kmk
-share/kBuild/tools/XGCCAMD64LINUX.kmk
-share/kBuild/tools/YACC.kmk
-share/kBuild/tools/YASM.kmk
-share/kBuild/tools/ZIP.kmk
-share/kBuild/units/dtrace.kmk
-share/kBuild/units/lex.kmk
-share/kBuild/units/qt3.kmk
-share/kBuild/units/qt4.kmk
-share/kBuild/units/qt5.kmk
-share/kBuild/units/vccprecomp.kmk
-share/kBuild/units/yacc.kmk
-share/kBuild/up.kmk
diff --git a/kbuild/distinfo b/kbuild/distinfo
deleted file mode 100644
index 5a4df0f227..0000000000
--- a/kbuild/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.1 2016/07/08 09:42:53 kamil Exp $
-
-SHA1 (kBuild-r3127.tar.gz) = 28417f588c0297c128372ad034112a89187a3e6e
-RMD160 (kBuild-r3127.tar.gz) = 753115612e4fa1c50cd674fd525e1f74bd7f9d4e
-SHA512 (kBuild-r3127.tar.gz) = c345020565b93ab4670037247fff6ed452faf6cf57c28301b5edb205faa5dc80268509182552d8aa58dbd34ec1cfb9394c9dcdc2707b5ea08341df2e834a93a2
-Size (kBuild-r3127.tar.gz) = 17644129 bytes
-SHA1 (patch-kBuild_header.kmk) = bcba91ea5f4ae200087aa0adf4632b461661ed26
-SHA1 (patch-src_kmk_Makefile.kmk) = 7647322e79030bf794caa900feaf5dbe293a2247
-SHA1 (patch-src_kmk_kmkbuiltin_osdep.c) = de8a40b3a454abaf82b3384f0c44dd98794d0267
-SHA1 (patch-src_sed_lib_utils.c) = a2414f2d80623b94ab34fbc1744a2e3bc33571b3
diff --git a/kbuild/files/SvnInfo.kmk b/kbuild/files/SvnInfo.kmk
deleted file mode 100644
index 06c14d5804..0000000000
--- a/kbuild/files/SvnInfo.kmk
+++ /dev/null
@@ -1,2 +0,0 @@
-KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk
-KBUILD_SVN_REV := 3127
diff --git a/kbuild/patches/patch-kBuild_header.kmk b/kbuild/patches/patch-kBuild_header.kmk
deleted file mode 100644
index e93ed580d4..0000000000
--- a/kbuild/patches/patch-kBuild_header.kmk
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-kBuild_header.kmk,v 1.1 2016/07/08 09:42:54 kamil Exp $
-
-Add NetBSD support.
-
---- kBuild/header.kmk.orig 2017-10-31 19:58:59.266699000 +0900
-+++ kBuild/header.kmk 2017-12-01 23:26:50.457456974 +0900
-@@ -648,10 +648,10 @@
- SUFF_LIB := .a
- SUFF_DLL := .so
- SUFF_EXE :=
-- if1of ($(KBUILD_TARGET), dragonfly freebsd gnukfbsd gnuknbsd linux netbsd openbsd) ## @todo check netbsd, gnuknbsd and openbsd.
-+ if1of ($(KBUILD_TARGET), dragonfly freebsd gnukfbsd gnuknbsd linux openbsd) ## @todo check netbsd, gnuknbsd and openbsd.
- SUFF_SYS := .ko
-- else
--SUFF_SYS :=
-+ else ifeq ($(KBUILD_TARGET),netbsd)
-+SUFF_SYS := .kmod
- endif
- SUFF_RES :=
- endif
-@@ -1443,8 +1443,7 @@
- KBUILD_LIB_SEARCH_SUBS :=
- KBUILD_LIB_SEARCH_ROOTS :=
- endif
--KBUILD_LIB_SEARCH_PATHS := $(foreach root, $(KBUILD_LIB_SEARCH_ROOTS), $(addprefix $(root),$(KBUILD_LIB_SEARCH_SUBS)))
--
-+KBUILD_LIB_SEARCH_PATHS ?= $(foreach root, $(KBUILD_LIB_SEARCH_ROOTS), $(addprefix $(root),$(KBUILD_LIB_SEARCH_SUBS)))
-
- #
- # This is how we find the closest config.kmk.
-@@ -1744,4 +1743,3 @@
- # end-of-file-content
- __header_kmk__ := 1
- endif # !__header_kmk__
--
diff --git a/kbuild/patches/patch-src_kmk_Makefile.kmk b/kbuild/patches/patch-src_kmk_Makefile.kmk
deleted file mode 100644
index 0073af88fd..0000000000
--- a/kbuild/patches/patch-src_kmk_Makefile.kmk
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_kmk_Makefile.kmk,v 1.1 2016/07/08 09:42:54 kamil Exp $
-
-Add NetBSD support.
-
---- src/kmk/Makefile.kmk.orig 2017-11-26 23:29:40.000000000 +0900
-+++ src/kmk/Makefile.kmk 2017-11-27 00:19:02.807006197 +0900
-@@ -264,6 +264,9 @@
- w32/subproc/sub_proc.c
-
- kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
-+kmk_DEFS.netbsd.x86 = CONFIG_WITHOUT_THREADS
-+
-+kmk_LIBS.netbsd = pthread
-
- #kmk_LIBS.solaris = malloc
- #kmk_DEFS.solaris += HAVE_MALLINFO
-@@ -702,5 +705,3 @@
- test_2ndtargetexp \
- test_30_continued_on_failure \
- test_lazy_deps_vars
--
--
diff --git a/kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c b/kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c
deleted file mode 100644
index 67b99919c1..0000000000
--- a/kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_kmk_kmkbuiltin_osdep.c,v 1.1 2016/07/08 09:42:54 kamil Exp $
-
-Add NetBSD support.
-
---- src/kmk/kmkbuiltin/osdep.c.orig 2017-11-26 23:29:40.350768372 +0900
-+++ src/kmk/kmkbuiltin/osdep.c 2017-12-02 00:41:40.030220196 +0900
-@@ -41,8 +41,10 @@
- #elif defined(__OpenBSD__)
- # include "openbsd.c"
-
-+#elif defined(__NetBSD__)
-+# include <util.h>
-+
- #elif defined(__HAIKU__)
- # include "haikufakes.c"
-
- #endif
--
diff --git a/kbuild/patches/patch-src_sed_lib_utils.c b/kbuild/patches/patch-src_sed_lib_utils.c
deleted file mode 100644
index 3dccd5ca20..0000000000
--- a/kbuild/patches/patch-src_sed_lib_utils.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_sed_lib_utils.c,v 1.1 2016/07/08 09:42:54 kamil Exp $
-
-Add missing include.
-
---- src/sed/lib/utils.c.orig 2017-11-26 23:30:40.000000000 +0900
-+++ src/sed/lib/utils.c 2017-11-27 00:23:09.561021581 +0900
-@@ -35,6 +35,8 @@
- # include <stdlib.h>
- #endif /* HAVE_STDLIB_H */
-
-+#include <unistd.h>
-+
- #include "utils.h"
-
- #ifdef KBUILD_OS_WINDOWS /* bird: Way faster console output! */
Home |
Main Index |
Thread Index |
Old Index