From umq@ueo.co.jp  Tue Mar 26 23:08:54 2013
Return-Path: <umq@ueo.co.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 881CB173
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Mar 2013 23:08:54 +0000 (UTC)
	(envelope-from umq@ueo.co.jp)
Received: from msa04b.plala.or.jp (msa04.plala.or.jp [58.93.240.4])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B4ADBFF
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Mar 2013 23:08:53 +0000 (UTC)
Received: from terpsichore.kaumoge.org ([125.205.160.110])
          by msa04b.plala.or.jp with ESMTP
          id <20130326230840.TWXO10966.msa04b.plala.or.jp@terpsichore.kaumoge.org>;
          Wed, 27 Mar 2013 08:08:40 +0900
Received: from calliope.kaumoge.org (calliope.kaumoge.org [192.168.24.120])
	by terpsichore.kaumoge.org (8.14.5/8.14.5/20101205) with ESMTP id r2QN8bek054448;
	Wed, 27 Mar 2013 08:08:37 +0900 (JST)
	(envelope-from umq@ueo.co.jp)
Message-Id: <86hajxlpxm.wl%umq@ueo.co.jp>
Date: Wed, 27 Mar 2013 08:08:37 +0900
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Mk/bsd.ldap.mk move -DLDAP_DEPRECATED from CFLAGS to CPPFLAGS
X-Send-Pr-Version: 3.113

>Number:         177401
>Category:       ports
>Synopsis:       Mk/bsd.ldap.mk move -DLDAP_DEPRECATED from CFLAGS to CPPFLAGS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 26 23:10:00 UTC 2013
>Closed-Date:    
>Last-Modified:  Wed Sep 18 22:20:00 UTC 2013
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
	# this is a blocker of ports/177369

	Recently, ftp/curl upstream introduced a sanity check on
	CFLAGS and CPPFLAGS[1,2].

	This stops configure script[3].

	As changing CFLAGS to CPPFLAGS worked for ports/177369,
	I'd like to request exp-run for the whole tree.

	[1] https://github.com/bagder/curl/commit/c691037517a969891592e9dbae0a6ed615041881
	[2] https://github.com/bagder/curl/commit/9d1effad0524bcb4763e06659b728ba134464608
	[3] https://redports.org/~umq/20130325093420-88623-109924/curl-7.29.0.log

>How-To-Repeat:
	N/A
>Fix:

	The patch follows:

Index: Mk/bsd.ldap.mk
===================================================================
--- Mk/bsd.ldap.mk	(revision 315337)
+++ Mk/bsd.ldap.mk	(working copy)
@@ -64,7 +64,7 @@
 .endif
 .endif
 
-CFLAGS+=	-DLDAP_DEPRECATED
+CPPFLAGS+=	-DLDAP_DEPRECATED
 
 _OPENLDAP_CLIENT_PKG!=	${PKG_INFO} -Ex openldap.\*-client 2>/dev/null || ${TRUE}
 _OPENLDAP_FLAVOUR=	${_OPENLDAP_CLIENT_PKG:C/openldap//:C/-client-.*//}

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: sunpoet 
Responsible-Changed-When: Mon Aug 5 14:11:08 UTC 2013 
Responsible-Changed-Why:  
Request -exp run for the following 2 cases: 

1) Change CFLAGS to CPPFLAGS 
patch available at 
http://people.FreeBSD.org/~sunpoet/bsd.ldap.mk.1.patch 

2) Remove -DLDAP_DEPRECATED 
patch available at 
http://people.FreeBSD.org/~sunpoet/bsd.ldap.mk.2.patch 

Thanks. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=177401 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177401: commit references a PR
Date: Fri,  9 Aug 2013 16:39:55 +0000 (UTC)

 Author: sunpoet
 Date: Fri Aug  9 16:39:42 2013
 New Revision: 324450
 URL: http://svnweb.freebsd.org/changeset/ports/324450
 
 Log:
   - Add note about LDAP issue (-DLDAP_DEPRECATED)
   
   PR:		ports/177401
 
 Modified:
   head/ftp/curl/Makefile
 
 Modified: head/ftp/curl/Makefile
 ==============================================================================
 --- head/ftp/curl/Makefile	Fri Aug  9 16:25:48 2013	(r324449)
 +++ head/ftp/curl/Makefile	Fri Aug  9 16:39:42 2013	(r324450)
 @@ -251,6 +251,16 @@ post-patch:
  	@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure
  	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in
  
 +pre-configure:
 +.if ${PORT_OPTIONS:MLDAP}
 +	@${ECHO_MSG} "Note:"
 +	@${ECHO_MSG} ""
 +	@${ECHO_MSG} "  Enabling LDAP option is known to fail with unpatched Mk/bsd.ldap.mk."
 +	@${ECHO_MSG} "  See PR/177401 for detailed information."
 +	@${ECHO_MSG} "  URL: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177401"
 +	@${ECHO_MSG} ""
 +.endif
 +
  post-install:
  .if !defined(BUILDING_HIPHOP)
  	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal/
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: Dmitry A Grigorovich <odip@bionet.nsc.ru>
To: bug-followup@FreeBSD.org, umq@ueo.co.jp
Cc:  
Subject: Re: ports/177401: Mk/bsd.ldap.mk move -DLDAP_DEPRECATED from CFLAGS
 to CPPFLAGS
Date: Tue, 13 Aug 2013 01:37:15 +0700

 # /usr/ports/ftp/curl/files/patch-configure-2
 
 --- configure.0 2013-07-18 18:20:43.000000000 +0700
 +++ configure   2013-07-18 18:51:24.812565985 +0700
 @@ -3626,9 +3626,6 @@
     xc_bad_var_cflags=no
     for xc_word in $CFLAGS; do
       case "$xc_word" in
 -      -D*)
 -        xc_bad_var_cflags=yes
 -        ;;
         -U*)
           xc_bad_var_cflags=yes
           ;;
 @@ -39266,9 +39263,6 @@
     xc_bad_var_cflags=no
     for xc_word in $CFLAGS; do
       case "$xc_word" in
 -      -D*)
 -        xc_bad_var_cflags=yes
 -        ;;
         -U*)
           xc_bad_var_cflags=yes
           ;;
 
 -- 
 
 [ODiP] == Grigorovich Dmitry

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177401: commit references a PR
Date: Wed, 18 Sep 2013 22:13:29 +0000 (UTC)

 Author: sunpoet
 Date: Wed Sep 18 22:13:21 2013
 New Revision: 327585
 URL: http://svnweb.freebsd.org/changeset/ports/327585
 
 Log:
   - Disable CFLAGS=-D* check temporarily: workaround for LDAP issue [1] and CPUTYPE [2]
   - Remove note in pre-configure: since it does not help to avoid bug-report mails
   
   PR:		ports/177401 [1], ports/180648 [1], ports/180944 [2]
 
 Modified:
   head/ftp/curl/Makefile
   head/ftp/curl/files/patch-configure
 
 Modified: head/ftp/curl/Makefile
 ==============================================================================
 --- head/ftp/curl/Makefile	Wed Sep 18 22:03:12 2013	(r327584)
 +++ head/ftp/curl/Makefile	Wed Sep 18 22:13:21 2013	(r327585)
 @@ -250,16 +250,6 @@ post-patch:
  	@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure
  	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in
  
 -pre-configure:
 -.if ${PORT_OPTIONS:MLDAP}
 -	@${ECHO_MSG} "Note:"
 -	@${ECHO_MSG} ""
 -	@${ECHO_MSG} "  Enabling LDAP option is known to fail with unpatched Mk/bsd.ldap.mk."
 -	@${ECHO_MSG} "  See PR/177401 for detailed information."
 -	@${ECHO_MSG} "  URL: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177401"
 -	@${ECHO_MSG} ""
 -.endif
 -
  post-install:
  .if !defined(BUILDING_HIPHOP)
  	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal/
 
 Modified: head/ftp/curl/files/patch-configure
 ==============================================================================
 --- head/ftp/curl/files/patch-configure	Wed Sep 18 22:03:12 2013	(r327584)
 +++ head/ftp/curl/files/patch-configure	Wed Sep 18 22:13:21 2013	(r327585)
 @@ -6,19 +6,32 @@ Forwarded: not-needed
  Author: Peter Pentchev <roam@FreeBSD.org>
  Last-Update: 2010-12-19
  
 ---- configure.orig	2013-02-06 17:47:26.000000000 +0800
 -+++ configure	2013-02-18 18:25:16.000000000 +0800
 -@@ -16651,6 +16651,9 @@
 +--- configure.orig	2013-06-22 06:29:35.000000000 +0800
 ++++ configure	2013-09-18 01:39:42.256041308 +0800
 +@@ -3626,9 +3626,10 @@
 +   xc_bad_var_cflags=no
 +   for xc_word in $CFLAGS; do
 +     case "$xc_word" in
 +-      -D*)
 +-        xc_bad_var_cflags=yes
 +-        ;;
 ++# Temporarily disable -D* flag check (PR/177401, PR/180944)
 ++#      -D*)
 ++#        xc_bad_var_cflags=yes
 ++#        ;;
 +       -U*)
 +         xc_bad_var_cflags=yes
 +         ;;
 +@@ -16912,6 +16913,8 @@
       tmp_CFLAGS="$CFLAGS"
       tmp_CPPFLAGS="$CPPFLAGS"
   
 -+# Do not remove the user-supplied debug flags in CFLAGS
 -+# PR: 150854
 ++# Do not remove the user-supplied debug flags in CFLAGS (PR/150854)
  +if false; then
       ac_var_stripped=""
     for word1 in $tmp_CFLAGS; do
       ac_var_strip_word="no"
 -@@ -16681,6 +16684,7 @@
 +@@ -16942,6 +16945,7 @@
     done
       tmp_CPPFLAGS="$ac_var_stripped"
     squeeze tmp_CPPFLAGS
 @@ -26,17 +39,16 @@ Last-Update: 2010-12-19
   
       #
       if test "$want_debug" = "yes"; then
 -@@ -16898,6 +16902,9 @@
 +@@ -17159,6 +17163,8 @@
       #
       if test "$honor_optimize_option" = "yes"; then
   
 -+# Do not remove the user-supplied optimization flags in CFLAGS
 -+# PR: 150854
 ++# Do not remove the user-supplied optimization flags in CFLAGS (PR/150854)
  +if false; then
       ac_var_stripped=""
     for word1 in $tmp_CFLAGS; do
       ac_var_strip_word="no"
 -@@ -16928,6 +16935,7 @@
 +@@ -17189,6 +17195,7 @@
     done
       tmp_CPPFLAGS="$ac_var_stripped"
     squeeze tmp_CPPFLAGS
 @@ -44,7 +56,7 @@ Last-Update: 2010-12-19
   
         if test "$want_optimize" = "yes"; then
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
 -@@ -21379,7 +21387,8 @@
 +@@ -21614,7 +21621,8 @@
           PKGTEST="no"
       PREFIX_OPENSSL=$OPT_SSL
   
 @@ -54,7 +66,7 @@ Last-Update: 2010-12-19
       { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
   $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
       if test -f "$OPENSSL_PCDIR/openssl.pc"; then
 -@@ -24725,29 +24734,30 @@
 +@@ -24962,29 +24970,30 @@
       ;;
     off)
           LIB_RTMP="-lrtmp"
 @@ -94,3 +106,17 @@ Last-Update: 2010-12-19
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   /* end confdefs.h.  */
   
 +@@ -39256,9 +39265,10 @@
 +   xc_bad_var_cflags=no
 +   for xc_word in $CFLAGS; do
 +     case "$xc_word" in
 +-      -D*)
 +-        xc_bad_var_cflags=yes
 +-        ;;
 ++# Temporarily disable -D* flag check (PR/177401, PR/180944)
 ++#      -D*)
 ++#        xc_bad_var_cflags=yes
 ++#        ;;
 +       -U*)
 +         xc_bad_var_cflags=yes
 +         ;;
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
