aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/weechat-python.patch
blob: 8182636ecba593fe707e5b686e6ff6999147bdb7 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
Get Python LDFLAGS from 'pkg-config'.

The other approach is more complex and gets it wrong: it returns
"-L/path/to/python/lib/python-2.7.10/lib/python2.7/config -lpython -lwhatever";
since that config/ sub-directory contains libpython2.7.a, we end up
statically linking Python in Weechat's python.so, which we do not want.

--- weechat-1.3/configure.ac	2015-08-16 08:27:07.000000000 +0200
+++ weechat-1.3/configure.ac	2015-11-29 18:18:52.975197048 +0100
@@ -535,29 +535,7 @@ if test "x$enable_python" = "xyes" ; the
             if test -r "$PYTHON_INCLUDE/Python.h"; then
                 PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
                 AC_MSG_RESULT(found)
-                PYTHON_LIB=`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBPL'))"`
-                PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED'))"`
-                AC_MSG_CHECKING(for Python library)
-                if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
-                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
-                   AC_MSG_RESULT(found)
-                elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
-                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
-                   AC_MSG_RESULT(found)
-                elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.dll.a"; then
-                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
-                   AC_MSG_RESULT(found)
-                elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
-                   PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
-                   AC_MSG_RESULT(found)
-                else
-                    AC_MSG_WARN([
-*** Python library couldn't be found on your system.
-*** Try to install it with your software package manager.
-*** WeeChat will be built without Python support.])
-                    enable_python="no"
-                    not_found="$not_found python"
-                fi
+                PYTHON_LFLAGS=`pkg-config python2 --libs`
             else
                 AC_MSG_WARN([
 *** Python header files couldn't be found on your system.
indent-code.el.in: Set default directory by "indent-code.el" itself, otherwise it works only when called from the top directory of the guix source tree. 2017-04-22Increase "TasksMax" in 'guix-daemon.service'.Sergei Trofimovich * etc/guix-daemon.service.in (TasksMax): Increase to 8192. Signed-off-by: Leo Famulari <leo@famulari.name> 2017-03-06build: Don't embed absolute paths in .service and .conf service files.Leo Famulari Otherwise, users will be stuck running an old copy of guix and the guix-daemon if they copy the service files instead of symlinking them. * etc/guix-daemon.conf.in, etc/guix-daemon.service.in, etc/guix-publish.conf.in, etc/guix-publish.service.in: Expand @localstatedir@ instead of @bindir@. * nix/local.mk (etc/guix-%.service, etc/guix-%.conf): Use @localstatedir@ instead of @bindir@. 2017-02-08etc: The pre-push hook says which commits failed the signature check.Leo Famulari * etc/git/pre-push: Check each commit's signature individually so that we can report which commits fail the check. 2017-02-07bash completion: Complete subcommands for the current word.Ludovic Courtès * etc/completion/bash/guix (_guix_complete_subcommand): Refer to the $COMP_CWORD element instead of the last element. 2017-02-07bash completion: Properly complete 'guix container exec'.Ludovic Courtès * etc/completion/bash/guix (_guix_complete_pid): New function. (_guix_complete): Add case for "container". 2017-02-07bash completion: Complete file names after 'guix system COMMAND'.Ludovic Courtès * etc/completion/bash/guix (_guix_complete): When the command is "system" and $COMP_CWORD > 2, use _guix_complete_file. 2017-02-07bash completion: Complete 'guix gc' with file names.Ludovic Courtès Reported by a couple of cool folks at a bar in Brussels. * etc/completion/bash/guix (_guix_complete): Use '_guix_complete_file' for 'guix gc'. This fixes completion of 'guix gc -d'. 2017-01-20etc: indent-code.el: Add indentation info for non-Guix Scheme constructs.Ludovic Courtès * etc/indent-code.el.in (guix-syntax--scheme-indent): New macro. Use it. 2017-01-13etc: Support indentation of whole files.Ludovic Courtès * etc/indent-package.el.in: Rename to... * etc/indent-code.el.in: ... this. Add case for a single argument. * doc/contributing.texi (Formatting Code): Adjust accordingly. * configure.ac: Likewise. 2017-01-12etc: Add 'indent-package.el' script.Ludovic Courtès * configure.ac: Check for 'emacs', substitute 'EMACS', and emit 'etc/indent-package.el'. * etc/indent-package.el.in: New file. * doc/contributing.texi (Formatting Code): Mention 'etc/indent-package.el'. (Submitting Patches): Likewise, and link to the above node. Co-authored-by: Alex Kost <alezost@gmail.com> 2017-01-04doc: Add a Git hook that verifies signatures before pushing.Leo Famulari * HACKING (Commit Access): Describe the pre-push Git hook. * etc/git/pre-push: New file. 2016-11-24Add system start-up files for "guix publish".Hartmut Goebel * .gitignore: add etc/guix-publish.conf and /etc/guix-publish.service. * etc/guix-publish.conf.in: New file. * etc/guix-publish.service.in: New file. * nix/local.mk (etc/guix-%.service, etc/guix-%.conf): Generalized former build-rules for by using patterns. (nodist_systemdservice_DATA): Add etc/guix-publish.service, update comment. (nodist_upstartjob_DATA): Add etc/guix-publish.conf, update comment. * doc/guix.texi (Invoking guix publish): Add description for enabling "guix publish" on host distros using the new files. 2016-09-07bash completion: Complete subcommands and their options.Ludovic Courtès * etc/completion/bash/guix (_guix_complete_subcommand): New function. (_guix_complete_option): Allow completion of subcommand options. (_guix_complete): Use '_guix_complete_subcommand' for "system" and "import". 2016-09-07bash completion: Redirect 'guix' stderr to /dev/null.Ludovic Courtès This avoids spurious messages when pressing TAB. * etc/completion/bash/guix (_guix_complete_available_package) (_guix_complete_installed_package, _guix_complete_option) (_guix_complete): Redirect stderr to /dev/null when running 'guix'. 2016-09-07Add Zsh completion file.Eric Le Bihan * etc/completion/zsh/_guix: New file. * Makefile.am (dist_zshcompletion_DATA): New variable. * configure.ac: Add --with-zsh-completion-dir. Signed-off-by: Ludovic Courtès <ludo@gnu.org> 2016-07-18Set "GUIX_LOCPATH" in 'guix-daemon.service'.Ricardo Wurmus Suggested by Thomas Danckaert <thomas.danckaert@gmail.com>. * etc/guix-daemon.service.in (Environment): New value. 2016-04-25Add "TasksMax=1024" in 'guix-daemon.service'.Ludovic Courtès Suggested by Joram Schrijver <i+guix-devel@joram.io>. * etc/guix-daemon.service.in (TasksMax): New value.