From 7682a1ae44f035446180674ea1dbb3c5b0e7cd8a Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sat, 7 Apr 2012 11:31:34 +0200 Subject: [PATCH] perl: fix compilation on OS X (bug #30701) --- ChangeLog | 3 ++- src/plugins/scripts/perl/CMakeLists.txt | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3ec0e00bb..1daa9579a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.3.8-dev, 2012-04-05 +v0.3.8-dev, 2012-04-07 Version 0.3.8 (under dev!) @@ -48,6 +48,7 @@ Version 0.3.8 (under dev!) * irc: add search for lower case nicks in option irc.look.nick_color_force * logger: add colors for backlog lines and end of backlog, new options: logger.color.backlog_line and logger.color.backlog_end (task #11966) +* perl: fix compilation on OS X (bug #30701) * perl: fix crash on quit on OS X * relay: redirect some irc messages from clients to hide output (messages: mode, ison, list, names, topic, who, whois, whowas, time, userhost) (bug #33516) diff --git a/src/plugins/scripts/perl/CMakeLists.txt b/src/plugins/scripts/perl/CMakeLists.txt index df598b960..276477f89 100644 --- a/src/plugins/scripts/perl/CMakeLists.txt +++ b/src/plugins/scripts/perl/CMakeLists.txt @@ -23,6 +23,11 @@ weechat-perl-api.h) SET_TARGET_PROPERTIES(perl PROPERTIES PREFIX "") IF(PERL_FOUND) + IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + # remove "-arch xxx" on Mac OS X + STRING(REGEX REPLACE "-arch ppc|-arch i386|-arch x86_64" "" PERL_CFLAGS "${PERL_CFLAGS}") + STRING(REGEX REPLACE "-arch ppc|-arch i386|-arch x86_64" "" PERL_LFLAGS "${PERL_LFLAGS}") + ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ADD_DEFINITIONS(${PERL_CFLAGS}) INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH}) # ugly hack to force linking against Dynaloader.a