dev-util: Remove old CMake recipes; mark 3.8.2 as tested on gcc2_x86.

This commit is contained in:
Augustin Cavalier
2017-07-20 19:37:24 -04:00
parent ddb6c727ed
commit abd25f4e66
17 changed files with 1 additions and 4382 deletions

View File

@@ -1,63 +0,0 @@
SUMMARY="A cross-platform build system"
DESCRIPTION="CMake is a family of tools designed to build, test and package \
software. It is used to control the software compilation process using \
simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="http://www.cmake.org"
COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="7"
SOURCE_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz"
CHECKSUM_SHA256="b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562"
PATCHES="cmake-2.8.11.2.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
cmake = $portVersion compat >= 2.8
cmd:cmake = $portVersion compat >= 2.8
cmd:ccmake = $portVersion compat >= 2.8
cmd:cpack = $portVersion compat >= 2.8
cmd:ctest = $portVersion compat >= 2.8
"
REQUIRES="
haiku
lib:libncurses
"
BUILD_REQUIRES="
haiku_devel
devel:libncurses
"
BUILD_PREREQUIRES="
cmd:gcc
cmd:grep
cmd:ld
cmd:libtool
cmd:make
cmd:sed
"
BUILD()
{
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
make test VERBOSE=1
}

View File

@@ -1,68 +0,0 @@
SUMMARY="A cross-platform build system"
DESCRIPTION="CMake is a family of tools designed to build, test and package \
software. It is used to control the software compilation process using \
simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="http://www.cmake.org"
COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="1"
SOURCE_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0.tar.gz"
CHECKSUM_SHA256="99a34b7f74000404feffd82fba9d9e0cd623428c74b6a4851a0dee1c272606c0"
SOURCE_DIR="cmake-3.0.0"
PATCHES="cmake-3.0.0_rc6.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3.0
cmd:cmake = $portVersion compat >= 3.0
cmd:ccmake = $portVersion compat >= 3.0
cmd:cpack = $portVersion compat >= 3.0
cmd:ctest = $portVersion compat >= 3.0
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
BUILD()
{
# not an autotools configure
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

View File

@@ -1,68 +0,0 @@
SUMMARY="A cross-platform build system"
DESCRIPTION="CMake is a family of tools designed to build, test and package \
software. It is used to control the software compilation process using \
simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="http://www.cmake.org"
COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="1"
SOURCE_URI="http://www.cmake.org/files/v3.2/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3.2
cmd:cmake = $portVersion compat >= 3.2
cmd:ccmake = $portVersion compat >= 3.2
cmd:cpack = $portVersion compat >= 3.2
cmd:ctest = $portVersion compat >= 3.2
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
BUILD()
{
# not an autotools configure
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

View File

@@ -1,68 +0,0 @@
SUMMARY="A cross-platform build system"
DESCRIPTION="CMake is a family of tools designed to build, test and package \
software. It is used to control the software compilation process using \
simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="http://www.cmake.org"
COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="3"
SOURCE_URI="http://www.cmake.org/files/v3.3/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3
cmd:cmake = $portVersion compat >= 3
cmd:ccmake = $portVersion compat >= 3
cmd:cpack = $portVersion compat >= 3
cmd:ctest = $portVersion compat >= 3
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
BUILD()
{
# not an autotools configure
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

View File

@@ -1,68 +0,0 @@
SUMMARY="A cross-platform build system"
DESCRIPTION="CMake is a family of tools designed to build, test and package \
software. It is used to control the software compilation process using \
simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="http://www.cmake.org"
COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="1"
SOURCE_URI="http://www.cmake.org/files/v3.4/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3
cmd:cmake = $portVersion compat >= 3
cmd:ccmake = $portVersion compat >= 3
cmd:cpack = $portVersion compat >= 3
cmd:ctest = $portVersion compat >= 3
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
BUILD()
{
# not an autotools configure
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

View File

@@ -1,68 +0,0 @@
SUMMARY="A cross-platform build system"
DESCRIPTION="CMake is a family of tools designed to build, test and package \
software. It is used to control the software compilation process using \
simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="https://cmake.org/"
COPYRIGHT="2002-2016 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="1"
SOURCE_URI="https://cmake.org/files/v3.5/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3
cmd:cmake = $portVersion compat >= 3
cmd:ccmake = $portVersion compat >= 3
cmd:cpack = $portVersion compat >= 3
cmd:ctest = $portVersion compat >= 3
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
BUILD()
{
# not an autotools configure
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

View File

@@ -1,68 +0,0 @@
SUMMARY="A cross-platform build system"
DESCRIPTION="CMake is a family of tools designed to build, test and package \
software. It is used to control the software compilation process using \
simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="https://cmake.org/"
COPYRIGHT="2002-2016 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="1"
SOURCE_URI="https://cmake.org/files/v3.6/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3
cmd:cmake = $portVersion compat >= 3
cmd:ccmake = $portVersion compat >= 3
cmd:cpack = $portVersion compat >= 3
cmd:ctest = $portVersion compat >= 3
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
BUILD()
{
# not an autotools configure
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

View File

@@ -1,76 +0,0 @@
SUMMARY="A cross-platform build system"
DESCRIPTION="CMake is a family of tools designed to build, test and package \
software. It is used to control the software compilation process using \
simple platform and compiler independent configuration files. CMake generates \
native makefiles and workspaces that can be used in the compiler environment \
of your choice."
HOMEPAGE="https://cmake.org/"
COPYRIGHT="2002-2017 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="2"
SOURCE_URI="https://cmake.org/files/v3.7/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3
cmd:cmake = $portVersion compat >= 3
cmd:ccmake = $portVersion compat >= 3
cmd:cpack = $portVersion compat >= 3
cmd:ctest = $portVersion compat >= 3
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libcurl$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libcurl$secondaryArchSuffix
devel:libncurses$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:sed
"
BUILD()
{
# not an autotools configure
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir \
--no-server \
--no-system-libs \
--system-curl \
-- -DCMAKE_USE_LIBUV=0
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

View File

@@ -14,7 +14,7 @@ SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm"
SECONDARY_ARCHITECTURES="?x86"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,22 +0,0 @@
From 39333f7fd44b281cdaafb98820d549c923103011 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 22:30:55 +0200
Subject: Fix OpenAL search path.
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index 8150ff2..e0276f8 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -68,7 +68,7 @@
find_path(OPENAL_INCLUDE_DIR al.h
HINTS
ENV OPENALDIR
- PATH_SUFFIXES include/AL include/OpenAL include
+ PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
PATHS
~/Library/Frameworks
/Library/Frameworks
--
2.2.2

View File

@@ -1,77 +0,0 @@
From 551d725dbdcc4a66e7bfbd172d6b65907c1cb9d0 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 22:30:55 +0200
Subject: Fix OpenAL search path.
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index 8150ff2..e0276f8 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -68,7 +68,7 @@
find_path(OPENAL_INCLUDE_DIR al.h
HINTS
ENV OPENALDIR
- PATH_SUFFIXES include/AL include/OpenAL include
+ PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
PATHS
~/Library/Frameworks
/Library/Frameworks
--
2.2.2
From 91ff2dc74b26ad0511bc2591698078c15b5afb6b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 21 Nov 2015 22:02:38 +0000
Subject: Haiku provides elf.h now.
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index d062987..40f2f03 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -23,28 +23,20 @@
#if defined(__OpenBSD__)
# include <stdint.h>
# include <elf_abi.h>
-#elif defined(__HAIKU__)
-# include <elf32.h>
-# include <elf64.h>
- typedef struct Elf32_Ehdr Elf32_Ehdr;
- typedef struct Elf32_Shdr Elf32_Shdr;
- typedef struct Elf32_Sym Elf32_Sym;
- typedef struct Elf32_Rel Elf32_Rel;
- typedef struct Elf32_Rela Elf32_Rela;
-# define ELFMAG0 0x7F
-# define ELFMAG1 'E'
-# define ELFMAG2 'L'
-# define ELFMAG3 'F'
-# define ET_NONE 0
-# define ET_REL 1
-# define ET_EXEC 2
-# define ET_DYN 3
-# define ET_CORE 4
-# define EM_386 3
-# define EM_SPARC 2
-# define EM_PPC 20
#else
# include <elf.h>
+# ifndef ELFMAG0
+# define ELFMAG0 0x7F
+# endif
+# ifndef ELFMAG1
+# define ELFMAG1 'E'
+# endif
+# ifndef ELFMAG2
+# define ELFMAG2 'L'
+# endif
+# ifndef ELFMAG3
+# define ELFMAG3 'F'
+# endif
#endif
#if defined(__sun)
# include <sys/link.h> // For dynamic section information
--
2.2.2

View File

@@ -1,100 +0,0 @@
From 543646ad716146251a04905c0566a105a3192dbd Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 22:30:55 +0200
Subject: Fix OpenAL search path.
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index 8150ff2..e0276f8 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -68,7 +68,7 @@
find_path(OPENAL_INCLUDE_DIR al.h
HINTS
ENV OPENALDIR
- PATH_SUFFIXES include/AL include/OpenAL include
+ PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
PATHS
~/Library/Frameworks
/Library/Frameworks
--
2.7.0
From 5a77a5b124ea2e429bf5aa6d2c6e05b49775985d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 21 Nov 2015 22:02:38 +0000
Subject: Haiku provides elf.h now.
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 37dd328..c0b5d9e 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -23,28 +23,20 @@
#if defined(__OpenBSD__)
# include <stdint.h>
# include <elf_abi.h>
-#elif defined(__HAIKU__)
-# include <elf32.h>
-# include <elf64.h>
- typedef struct Elf32_Ehdr Elf32_Ehdr;
- typedef struct Elf32_Shdr Elf32_Shdr;
- typedef struct Elf32_Sym Elf32_Sym;
- typedef struct Elf32_Rel Elf32_Rel;
- typedef struct Elf32_Rela Elf32_Rela;
-# define ELFMAG0 0x7F
-# define ELFMAG1 'E'
-# define ELFMAG2 'L'
-# define ELFMAG3 'F'
-# define ET_NONE 0
-# define ET_REL 1
-# define ET_EXEC 2
-# define ET_DYN 3
-# define ET_CORE 4
-# define EM_386 3
-# define EM_SPARC 2
-# define EM_PPC 20
#else
# include <elf.h>
+# ifndef ELFMAG0
+# define ELFMAG0 0x7F
+# endif
+# ifndef ELFMAG1
+# define ELFMAG1 'E'
+# endif
+# ifndef ELFMAG2
+# define ELFMAG2 'L'
+# endif
+# ifndef ELFMAG3
+# define ELFMAG3 'F'
+# endif
#endif
#if defined(__sun)
# include <sys/link.h> // For dynamic section information
--
2.7.0
From 39878b19a2a282df2b5496b27bea1811d784b0b8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 20 Feb 2016 15:52:03 +0000
Subject: use libnetwork when it exists.
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 39b70c0..e8dc1f9 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -780,6 +780,8 @@ if(HAVE_LIBWS2_32)
set(CMAKE_REQUIRED_LIBRARIES ws2_32)
elseif(HAVE_LIBSOCKET)
set(CMAKE_REQUIRED_LIBRARIES socket)
+elseif(HAVE_LIBNETWORK)
+ set(CMAKE_REQUIRED_LIBRARIES network)
endif()
check_symbol_exists(basename "${CURL_INCLUDES}" HAVE_BASENAME)
--
2.7.0

View File

@@ -1,100 +0,0 @@
From 543646ad716146251a04905c0566a105a3192dbd Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 22:30:55 +0200
Subject: Fix OpenAL search path.
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index eb63cef..594560b 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -68,7 +68,7 @@
find_path(OPENAL_INCLUDE_DIR al.h
HINTS
ENV OPENALDIR
- PATH_SUFFIXES include/AL include/OpenAL include
+ PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
PATHS
~/Library/Frameworks
/Library/Frameworks
--
2.7.0
From 5a77a5b124ea2e429bf5aa6d2c6e05b49775985d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 21 Nov 2015 22:02:38 +0000
Subject: Haiku provides elf.h now.
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index b480cd5..558f990 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -19,28 +19,20 @@
#if defined(__OpenBSD__)
# include <stdint.h>
# include <elf_abi.h>
-#elif defined(__HAIKU__)
-# include <elf32.h>
-# include <elf64.h>
- typedef struct Elf32_Ehdr Elf32_Ehdr;
- typedef struct Elf32_Shdr Elf32_Shdr;
- typedef struct Elf32_Sym Elf32_Sym;
- typedef struct Elf32_Rel Elf32_Rel;
- typedef struct Elf32_Rela Elf32_Rela;
-# define ELFMAG0 0x7F
-# define ELFMAG1 'E'
-# define ELFMAG2 'L'
-# define ELFMAG3 'F'
-# define ET_NONE 0
-# define ET_REL 1
-# define ET_EXEC 2
-# define ET_DYN 3
-# define ET_CORE 4
-# define EM_386 3
-# define EM_SPARC 2
-# define EM_PPC 20
#else
# include <elf.h>
+# ifndef ELFMAG0
+# define ELFMAG0 0x7F
+# endif
+# ifndef ELFMAG1
+# define ELFMAG1 'E'
+# endif
+# ifndef ELFMAG2
+# define ELFMAG2 'L'
+# endif
+# ifndef ELFMAG3
+# define ELFMAG3 'F'
+# endif
#endif
#if defined(__sun)
# include <sys/link.h> // For dynamic section information
--
2.7.0
From 39878b19a2a282df2b5496b27bea1811d784b0b8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 20 Feb 2016 15:52:03 +0000
Subject: use libnetwork when it exists.
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 39b70c0..e8dc1f9 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -780,6 +780,8 @@ if(HAVE_LIBWS2_32)
set(CMAKE_REQUIRED_LIBRARIES ws2_32)
elseif(HAVE_LIBSOCKET)
set(CMAKE_REQUIRED_LIBRARIES socket)
+elseif(HAVE_LIBNETWORK)
+ set(CMAKE_REQUIRED_LIBRARIES network)
endif()
check_symbol_exists(basename "${CURL_INCLUDES}" HAVE_BASENAME)
--
2.7.0

View File

@@ -1,100 +0,0 @@
From 396b4ed14b91ca0d52300ed2d1b274b956535232 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 22:30:55 +0200
Subject: Fix OpenAL search path.
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index eb63cef..594560b 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -68,7 +68,7 @@
find_path(OPENAL_INCLUDE_DIR al.h
HINTS
ENV OPENALDIR
- PATH_SUFFIXES include/AL include/OpenAL include
+ PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
PATHS
~/Library/Frameworks
/Library/Frameworks
--
2.7.0
From 68da04c3931e80a77c6b6697a756431f06405f23 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 21 Nov 2015 22:02:38 +0000
Subject: Haiku provides elf.h now.
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 26f1a44..f83fec0 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -20,28 +20,20 @@
#if defined(__OpenBSD__)
#include <elf_abi.h>
#include <stdint.h>
-#elif defined(__HAIKU__)
-#include <elf32.h>
-#include <elf64.h>
-typedef struct Elf32_Ehdr Elf32_Ehdr;
-typedef struct Elf32_Shdr Elf32_Shdr;
-typedef struct Elf32_Sym Elf32_Sym;
-typedef struct Elf32_Rel Elf32_Rel;
-typedef struct Elf32_Rela Elf32_Rela;
-#define ELFMAG0 0x7F
-#define ELFMAG1 'E'
-#define ELFMAG2 'L'
-#define ELFMAG3 'F'
-#define ET_NONE 0
-#define ET_REL 1
-#define ET_EXEC 2
-#define ET_DYN 3
-#define ET_CORE 4
-#define EM_386 3
-#define EM_SPARC 2
-#define EM_PPC 20
#else
#include <elf.h>
+# ifndef ELFMAG0
+# define ELFMAG0 0x7F
+# endif
+# ifndef ELFMAG1
+# define ELFMAG1 'E'
+# endif
+# ifndef ELFMAG2
+# define ELFMAG2 'L'
+# endif
+# ifndef ELFMAG3
+# define ELFMAG3 'F'
+# endif
#endif
#if defined(__sun)
#include <sys/link.h> // For dynamic section information
--
2.7.0
From 1d0aee56562e1aeea03ed46fa354ca3848687663 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 20 Feb 2016 15:52:03 +0000
Subject: use libnetwork when it exists.
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 9031181..aed77af 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -783,6 +783,8 @@ if(HAVE_LIBWS2_32)
set(CMAKE_REQUIRED_LIBRARIES ws2_32)
elseif(HAVE_LIBSOCKET)
set(CMAKE_REQUIRED_LIBRARIES socket)
+elseif(HAVE_LIBNETWORK)
+ set(CMAKE_REQUIRED_LIBRARIES network)
endif()
check_symbol_exists(basename "${CURL_INCLUDES}" HAVE_BASENAME)
--
2.7.0

View File

@@ -1,99 +0,0 @@
From 92d374dd798f1b805d91395991ea1679358321c2 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 22:30:55 +0200
Subject: Fix OpenAL search path.
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index 1abb0d6..f140682 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -58,7 +58,7 @@
find_path(OPENAL_INCLUDE_DIR al.h
HINTS
ENV OPENALDIR
- PATH_SUFFIXES include/AL include/OpenAL include
+ PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
PATHS
~/Library/Frameworks
/Library/Frameworks
--
2.11.0
From 3def505b9d0c5b18e9d73ff387554c4fa1597a38 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 21 Nov 2015 22:02:38 +0000
Subject: Haiku provides elf.h now.
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 2d86674..aad0fb6 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -15,28 +15,20 @@
#if defined(__OpenBSD__)
#include <elf_abi.h>
#include <stdint.h>
-#elif defined(__HAIKU__)
-#include <elf32.h>
-#include <elf64.h>
-typedef struct Elf32_Ehdr Elf32_Ehdr;
-typedef struct Elf32_Shdr Elf32_Shdr;
-typedef struct Elf32_Sym Elf32_Sym;
-typedef struct Elf32_Rel Elf32_Rel;
-typedef struct Elf32_Rela Elf32_Rela;
-#define ELFMAG0 0x7F
-#define ELFMAG1 'E'
-#define ELFMAG2 'L'
-#define ELFMAG3 'F'
-#define ET_NONE 0
-#define ET_REL 1
-#define ET_EXEC 2
-#define ET_DYN 3
-#define ET_CORE 4
-#define EM_386 3
-#define EM_SPARC 2
-#define EM_PPC 20
#else
#include <elf.h>
+# ifndef ELFMAG0
+# define ELFMAG0 0x7F
+# endif
+# ifndef ELFMAG1
+# define ELFMAG1 'E'
+# endif
+# ifndef ELFMAG2
+# define ELFMAG2 'L'
+# endif
+# ifndef ELFMAG3
+# define ELFMAG3 'F'
+# endif
#endif
#if defined(__sun)
#include <sys/link.h> // For dynamic section information
--
2.11.0
From 7782383697fe69839f2e1b9afff378f9a51a5305 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 20 Feb 2016 15:52:03 +0000
Subject: use libnetwork when it exists.
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 9031181..aed77af 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -783,6 +783,8 @@ if(HAVE_LIBWS2_32)
set(CMAKE_REQUIRED_LIBRARIES ws2_32)
elseif(HAVE_LIBSOCKET)
set(CMAKE_REQUIRED_LIBRARIES socket)
+elseif(HAVE_LIBNETWORK)
+ set(CMAKE_REQUIRED_LIBRARIES network)
endif()
check_symbol_exists(basename "${CURL_INCLUDES}" HAVE_BASENAME)
--
2.11.0