Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Jun 2024 02:47:12 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8757b4a19535 - main - ftp/curl: Clean up patch file after librtmp removal
Message-ID:  <202406030247.4532lC4P062480@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8757b4a195358d2b74d9d64c623aedd574c8e998

commit 8757b4a195358d2b74d9d64c623aedd574c8e998
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-06-03 02:37:30 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-06-03 02:37:30 +0000

    ftp/curl: Clean up patch file after librtmp removal
    
    multimedia/librtmp is removed in 8d01b5458f4660725fcaf562cdbb073debc9b751
    RTMP option is removed in ac11b26ab75ddd548c39fe64ccf2e5de66842bd3
---
 ftp/curl/files/patch-configure | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure
index 74ac7907265c..f5b6f3568096 100644
--- a/ftp/curl/files/patch-configure
+++ b/ftp/curl/files/patch-configure
@@ -124,47 +124,6 @@
  
        if test "$want_optimize" = "yes"; then
          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
-@@ -29748,31 +29753,31 @@ printf "%s\n" "found" >&6; }
-     ;;
-   off)
-         LIB_RTMP="-lrtmp"
-+        LD_RTMP=""
-+        CPP_RTMP=""
-+        DIR_RTMP=""
-     ;;
-   *)
-         LIB_RTMP="-lrtmp"
-+        LD_RTMP="-L${PREFIX_RTMP}/lib$libsuff"
-+        CPP_RTMP="-I${PREFIX_RTMP}/include"
-+        DIR_RTMP="${PREFIX_RTMP}/lib$libsuff"
-     PREFIX_RTMP=$OPT_LIBRTMP
-     ;;
-   esac
- 
--    if test -n "$PREFIX_RTMP"; then
--    LD_RTMP=-L${PREFIX_RTMP}/lib$libsuff
--    CPP_RTMP=-I${PREFIX_RTMP}/include
--    DIR_RTMP=${PREFIX_RTMP}/lib$libsuff
--  fi
--
-   LDFLAGS="$LDFLAGS $LD_RTMP"
-   CPPFLAGS="$CPPFLAGS $CPP_RTMP"
-   LIBS="$LIB_RTMP $LIBS"
- 
--  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5
--printf %s "checking for RTMP_Init in -lrtmp... " >&6; }
-+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5
-+printf %s "checking for RTMP_Init in $LIB_RTMP... " >&6; }
- if test ${ac_cv_lib_rtmp_RTMP_Init+y}
- then :
-   printf %s "(cached) " >&6
- else $as_nop
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lrtmp  $LIBS"
-+LIBS="$LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
 @@ -45884,9 +45889,10 @@ printf "%s\n" "$as_me: LIBS note: LIBS should only be 
        -I*)
          xc_bad_var_ldflags=yes



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406030247.4532lC4P062480>