Bug 177401 - Mk/bsd.ldap.mk move -DLDAP_DEPRECATED from CFLAGS to CPPFLAGS
Summary: Mk/bsd.ldap.mk move -DLDAP_DEPRECATED from CFLAGS to CPPFLAGS
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Ports Framework (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Po-Chuan Hsieh
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-03-26 23:10 UTC by Hirohisa Yamaguchi
Modified: 2014-11-01 22:36 UTC (History)
2 users (show)

See Also:


Attachments
file.diff (410 bytes, patch)
2013-03-26 23:10 UTC, Hirohisa Yamaguchi
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Hirohisa Yamaguchi 2013-03-26 23:10:00 UTC
	# 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

Fix: The patch follows:
How-To-Repeat: 	N/A
Comment 1 Po-Chuan Hsieh freebsd_committer freebsd_triage 2013-08-05 15:11:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->portmgr

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.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-08-09 17:39:55 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"
Comment 3 Dmitry A Grigorovich 2013-08-12 19:37:15 UTC
# /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
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-09-18 23:13:29 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"
Comment 5 Mark Linimon freebsd_committer freebsd_triage 2014-06-02 01:22:41 UTC
Infrastructure PR.
Comment 6 Antoine Brodin freebsd_committer freebsd_triage 2014-10-11 09:11:16 UTC
(In reply to Sunpoet Po-Chuan Hsieh from comment #1)
> Responsible Changed
> From-To: freebsd-ports-bugs->portmgr
> 
> 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.

Hi,

Is an exp-run still needed for this?  The patches are no longer available.
Please assign back to portmgr with exp-run flag set when you have a patch to exp-run.