diff options
author | cegger <cegger> | 2008-10-27 14:02:06 +0000 |
---|---|---|
committer | cegger <cegger> | 2008-10-27 14:02:06 +0000 |
commit | 17491c0323e24979f06103fe2800109776039bf9 (patch) | |
tree | e9c8fd239b66a978eba7f20ff88bcd5812b33c25 | |
parent | 8c315b9c92881d0514d05cd82b7367b85e69f848 (diff) | |
download | pkgsrc-17491c0323e24979f06103fe2800109776039bf9.tar.gz |
Remove workaround: 32bit headers are no longer required for compiling.
Recent changes in -current now allow building a 32bit binary on amd64 for this package.
While here, remove conflict with xentools32-* which was never packaged.
-rw-r--r-- | sysutils/xentools33/Makefile | 13 | ||||
-rw-r--r-- | sysutils/xentools33/files/elf_machdep.h | 41 | ||||
-rw-r--r-- | sysutils/xentools33/files/int_types.h | 73 |
3 files changed, 3 insertions, 124 deletions
diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile index 23d72062f4e..468ba1c97e8 100644 --- a/sysutils/xentools33/Makefile +++ b/sysutils/xentools33/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2008/10/08 19:13:41 cegger Exp $ +# $NetBSD: Makefile,v 1.11 2008/10/27 14:02:06 cegger Exp $ # VERSION= 3.3.0 DISTNAME= xen-${VERSION} PKGNAME= xentools33-${VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ EXTRACT_SUFX= .tar.gz @@ -29,7 +29,7 @@ ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 CONFLICTS+= libxen-[0-9]* CONFLICTS+= xentools20-[0-9]* -CONFLICTS+= xentools30-* xentools3-* xentools32-* +CONFLICTS+= xentools30-* xentools3-* WRKSRC= ${WRKDIR}/xen-${VERSION}/tools CHECK_PORTABILITY_SKIP= examples/* xm-test/ramdisk/make-release.sh @@ -148,13 +148,6 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen pre-build: rm -f ${WRKSRC}/check/check_x11_devel -.if ${MACHINE_ARCH} == "x86_64" - ${MKDIR} ${WRKSRC}/include/machine - ${TEST} -f ${WRKSRC}/include/machine/int_types.h || \ - ${CP} ${FILESDIR}/int_types.h ${WRKSRC}/include/machine - ${TEST} -f ${WRKSRC}/libxc/include/elf_machdep.h || \ - ${CP} ${FILESDIR}/elf_machdep.h ${WRKSRC}/include/machine -.endif .for s in ${BLKTAP_FILES} cp ${FILESDIR}/${s} ${WRKSRC}/blktap/drivers/ .endfor diff --git a/sysutils/xentools33/files/elf_machdep.h b/sysutils/xentools33/files/elf_machdep.h deleted file mode 100644 index 28c5e443c15..00000000000 --- a/sysutils/xentools33/files/elf_machdep.h +++ /dev/null @@ -1,41 +0,0 @@ -/* $NetBSD: elf_machdep.h,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ */ - -#ifndef __i386__ -#include <amd64/elf_machdep.h> -#else /* !__i386__ */ -/* i386 ELF definitions for gcc -m32 */ - -#define ELF32_MACHDEP_ENDIANNESS ELFDATA2LSB -#define ELF32_MACHDEP_ID_CASES \ - case EM_386: \ - case EM_486: \ - break; - -#define ELF64_MACHDEP_ENDIANNESS XXX /* break compilation */ -#define ELF64_MACHDEP_ID_CASES \ - /* no 64-bit ELF machine types supported */ - -#define ELF32_MACHDEP_ID EM_386 - -#define ARCH_ELFSIZE 32 /* MD native binary size */ - -/* i386 relocations */ -#define R_386_NONE 0 -#define R_386_32 1 -#define R_386_PC32 2 -#define R_386_GOT32 3 -#define R_386_PLT32 4 -#define R_386_COPY 5 -#define R_386_GLOB_DAT 6 -#define R_386_JMP_SLOT 7 -#define R_386_RELATIVE 8 -#define R_386_GOTOFF 9 -#define R_386_GOTPC 10 -/* The following relocations are GNU extensions. */ -#define R_386_16 20 -#define R_386_PC16 21 -#define R_386_8 22 -#define R_386_PC8 23 - -#define R_TYPE(name) __CONCAT(R_386_,name) -#endif /* !__i386__ */ diff --git a/sysutils/xentools33/files/int_types.h b/sysutils/xentools33/files/int_types.h deleted file mode 100644 index 7f57d453888..00000000000 --- a/sysutils/xentools33/files/int_types.h +++ /dev/null @@ -1,73 +0,0 @@ -/* $NetBSD: int_types.h,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)types.h 7.5 (Berkeley) 3/9/91 - */ - -#ifndef __i386__ -#include <amd64/int_types.h> -#else /* !__i386__ */ -/* i386 types definitions for gcc -m32 */ -#ifndef _I386_INT_TYPES_H_ -#define _I386_INT_TYPES_H_ - -#include <sys/cdefs.h> - -/* - * 7.18.1 Integer types - */ - -/* 7.18.1.1 Exact-width integer types */ - -typedef signed char __int8_t; -typedef unsigned char __uint8_t; -typedef short int __int16_t; -typedef unsigned short int __uint16_t; -typedef int __int32_t; -typedef unsigned int __uint32_t; -#ifdef __COMPILER_INT64__ -typedef __COMPILER_INT64__ __int64_t; -typedef __COMPILER_UINT64__ __uint64_t; -#else -/* LONGLONG */ -typedef long long int __int64_t; -/* LONGLONG */ -typedef unsigned long long int __uint64_t; -#endif - -#define __BIT_TYPES_DEFINED__ - -/* 7.18.1.4 Integer types capable of holding object pointers */ - -typedef int __intptr_t; -typedef unsigned int __uintptr_t; - -#endif /* !_I386_INT_TYPES_H_ */ -#endif /* !__i386__ */ |