[pkg-otr-team] [irssi-plugin-otr] 156/167: Don't forget the usual "-g -O2" CFLAGS in win32 libraries

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to tag 4.0.0
in repository irssi-plugin-otr.

commit 27b7c9b6fc8f7d27d93268e1df33161e08dda038
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Thu Aug 23 07:30:42 2012 -0400

    Don't forget the usual "-g -O2" CFLAGS in win32 libraries
    
    Ensure "-g -O2" is also in the CFLAGS (in addition to the hardening
    options) when building libgpg-error and libgcrypt on win32.
---
 INSTALL.mingw | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/INSTALL.mingw b/INSTALL.mingw
index eb4becd..25e74b0 100644
--- a/INSTALL.mingw
+++ b/INSTALL.mingw
@@ -36,7 +36,7 @@ libgpg-error-1.0:
   HOST_CC=gcc
   DLLTOOL=i586-mingw32msvc-dlltool
   AS=i586-mingw32msvc-as
-  CFLAGS="-fstack-protector-all -Wstack-protector -fwrapv --param ssp-buffer-size=1 -fno-strict-overflow"
+  CFLAGS="-g -O2 -fstack-protector-all -Wstack-protector -fwrapv --param ssp-buffer-size=1 -fno-strict-overflow"
   LDFLAGS="-pie"
   export HOST_CC DLLTOOL AS CFLAGS LDFLAGS
   ./configure --with-pic --build=`./config.guess` --host=i586-mingw32msvc --prefix=/usr/i586-mingw32msvc 
@@ -49,7 +49,7 @@ libgcrypt-1.2.1:
   wget http://www.cypherpunks.ca/otr/rndw32.diff
   tar -xvzf libgcrypt-1.2.1.tar.gz
   cd /tmp/libgcrypt-1.2.1
-  CFLAGS="-fstack-protector-all -Wstack-protector -fwrapv --param ssp-buffer-size=1 -fno-strict-overflow"
+  CFLAGS="-g -O2 -fstack-protector-all -Wstack-protector -fwrapv --param ssp-buffer-size=1 -fno-strict-overflow"
   LDFLAGS="-pie"
   export CFLAGS LDFLAGS
   w32root=/usr/i586-mingw32msvc ./autogen.sh --build-w32
@@ -60,14 +60,6 @@ libgcrypt-1.2.1:
   make
   sudo make install
   
-libotr:
-  autoreconf -s -i
-  ./configure --with-pic --build=`./config.guess` --host=i586-mingw32msvc --prefix=/usr/i586-mingw32msvc \
-              --with-libgcrypt-prefix=/usr/i586-mingw32msvc
-  make
-  sudo make install
-
-
 nsis:
   sudo apt-get install nsis
   # Locate the "nsisunz" plugin (a google search for "nsisunz.zip" should be sufficient)
@@ -79,6 +71,14 @@ nsis:
   unzip nsisunz.zip
   sudo cp /tmp/nsisunz/Release/nsisunz.dll /usr/share/nsis/Plugins/
 
+
+libotr:
+  autoreconf -s -i
+  ./configure --with-pic --build=`./config.guess` --host=i586-mingw32msvc --prefix=/usr/i586-mingw32msvc \
+              --with-libgcrypt-prefix=/usr/i586-mingw32msvc
+  make
+  sudo make install
+
 pidgin-otr:
   # You will need: Pidgin source code distributable,
   # Pidgin Win32 distributable, 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-otr/packages/irssi-plugin-otr.git