Author: Anonymous Language: text
Description: No description Timestamp: 2016-12-12 18:13:01 -0500
This paste is: private Expires: 2016-12-13 18:13:01 -0500
View raw paste Reply
  1. From 158b8e002238d8aaac7e0775e9dc0558d0a9caa2 Mon Sep 17 00:00:00 2001
  2. From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
  3. Date: Sun, 11 Dec 2016 14:30:27 +0000
  4. Subject: [PATCH] get_package_dependencies: set include path for curl on Haiku
  5.  
  6. ---
  7.  src/tools/get_package_dependencies/HTTPClient.cpp | 2 ++
  8.  src/tools/get_package_dependencies/HTTPClient.h   | 4 +++-
  9.  src/tools/get_package_dependencies/Jamfile        | 6 ++++++
  10.  3 files changed, 11 insertions(+), 1 deletion(-)
  11.  
  12. diff --git a/src/tools/get_package_dependencies/HTTPClient.cpp b/src/tools/get_package_dependencies/HTTPClient.cpp
  13. index 2297d4d..d4e6777 100644
  14. --- a/src/tools/get_package_dependencies/HTTPClient.cpp
  15. +++ b/src/tools/get_package_dependencies/HTTPClient.cpp
  16. @@ -11,6 +11,8 @@
  17.  
  18.  #include <File.h>
  19.  
  20. +#include <curl/curl.h>
  21. +
  22.  
  23.  HTTPClient::HTTPClient()
  24.         :
  25. diff --git a/src/tools/get_package_dependencies/HTTPClient.h b/src/tools/get_package_dependencies/HTTPClient.h
  26. index d178153..1b5fd33 100644
  27. --- a/src/tools/get_package_dependencies/HTTPClient.h
  28. +++ b/src/tools/get_package_dependencies/HTTPClient.h
  29. @@ -11,7 +11,9 @@
  30.  
  31.  #include <String.h>
  32.  #include <Entry.h>
  33. -#include <curl/curl.h>
  34. +
  35. +
  36. +typedef void CURL;
  37.  
  38.  
  39.  class HTTPClient {
  40. diff --git a/src/tools/get_package_dependencies/Jamfile b/src/tools/get_package_dependencies/Jamfile
  41. index 452afab..d6c7624 100644
  42. --- a/src/tools/get_package_dependencies/Jamfile
  43. +++ b/src/tools/get_package_dependencies/Jamfile
  44. @@ -6,6 +6,12 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin pkgman ] ;
  45.  
  46.  USES_BE_API on <build>get_package_dependencies = true ;
  47.  
  48. +# TODO: remove this hack once gcc2 has -iquote implemented
  49. +if $(HOST_PLATFORM) = haiku_host &&  $(HOST_GCC_VERSION[1]) < 3 {
  50. +       local locations = system/non-packaged system ;
  51. +       SourceHdrs HTTPClient.cpp : /boot/$(locations)/develop/headers/curl ;
  52. +}
  53. +
  54.  BuildPlatformMain <build>get_package_dependencies :
  55.         get_package_dependencies.cpp
  56.         HTTPClient.cpp
  57. --
  58. 2.7.0
  59.  
View raw paste Reply