-
-
Notifications
You must be signed in to change notification settings - Fork 14k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
profanity: refactor build to build from source
* fix osx build * fix undefined macros in configure.ac * activate the check phase to run the test suite
- Loading branch information
Showing
3 changed files
with
78 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
diff --git a/configure.ac b/configure.ac | ||
index 1e55b1cc..0832a387 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -22,7 +22,6 @@ AC_CANONICAL_HOST | ||
PLATFORM="unknown" | ||
AS_CASE([$host_os], | ||
[freebsd*], [PLATFORM="freebsd"], | ||
- [darwin*], [PLATFORM="osx"], | ||
[cygwin], [PLATFORM="cygwin"], | ||
[PLATFORM="nix"]) |
40 changes: 40 additions & 0 deletions
40
pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
diff --git a/configure.ac b/configure.ac | ||
index 1e55b1cc..0832a387 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -83,12 +81,12 @@ elif test "x$enable_python_plugins" != xno; then | ||
AM_CONDITIONAL([BUILD_PYTHON_API], [true]) | ||
AC_DEFINE([HAVE_PYTHON], [1], [Python support]) | ||
else | ||
- if test "x$enable_python_plugins" = xyes; then | ||
- AC_MSG_ERROR([Python not found, cannot enable Python plugins.]) | ||
- else | ||
- AM_CONDITIONAL([BUILD_PYTHON_API], [false]) | ||
- AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.]) | ||
- fi | ||
+ AS_IF( | ||
+ [test "x$enable_python_plugins" = xyes], | ||
+ [], | ||
+ [AM_CONDITIONAL([BUILD_PYTHON_API], [false]) | ||
+ AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])] | ||
+ ) | ||
fi | ||
AS_IF([test "x$PLATFORM" = xosx], [rm -f Python.framework]) | ||
else | ||
@@ -107,7 +105,7 @@ else | ||
[AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])], | ||
[AS_IF( | ||
[test "x$enable_c_plugins" = xyes], | ||
- [AC_MSG_ERROR([dl library needed to run C plugins])], | ||
+ [], | ||
[AM_CONDITIONAL([BUILD_C_API], [false])]) | ||
]) | ||
else | ||
@@ -116,7 +114,6 @@ else | ||
fi | ||
|
||
# threading | ||
-ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])]) | ||
LIBS="$PTHREAD_LIBS $LIBS" | ||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS" | ||
AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ]) |