diff mbox

[FFmpeg-devel] configure: jni no longer requires -ldl

Message ID 20170512183424.97070-1-ffmpeg@tmm1.net
State Accepted
Commit 376247a1028f0d143b737b409983a18cd9c4dd8a
Headers show

Commit Message

Aman Gupta May 12, 2017, 6:34 p.m. UTC
From: Aman Gupta <aman@tmm1.net>

this dependency was removed in 33d69a90085d30af8a292d9364b835a26565d6b9
---
 configure | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Aaron Levinson May 12, 2017, 7:14 p.m. UTC | #1
On 5/12/2017 11:34 AM, Aman Gupta wrote:
> From: Aman Gupta <aman@tmm1.net>
>
> this dependency was removed in 33d69a90085d30af8a292d9364b835a26565d6b9
> ---
>  configure | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 5ae5227868..ba33241a45 100755
> --- a/configure
> +++ b/configure
> @@ -5766,8 +5766,7 @@ enabled decklink          && { { check_header DeckLinkAPI.h || die "ERROR: DeckL
>  enabled frei0r            && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
>  enabled gmp               && require gmp gmp.h mpz_export -lgmp
>  enabled gnutls            && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
> -enabled jni               && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads &&
> -                               check_lib jni "dlfcn.h" dlopen -ldl || die "ERROR: jni not found"; }
> +enabled jni               && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads || die "ERROR: jni not found"; }
>  enabled ladspa            && { check_header ladspa.h || die "ERROR: ladspa.h header not found"; }
>  enabled libiec61883       && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
>  enabled libass            && require_pkg_config libass ass/ass.h ass_library_init
>

LGTM--I see that the use of dl was eliminated in 33d69a9 (at 
https://github.com/FFmpeg/FFmpeg/commit/33d69a90085d30af8a292d9364b835a26565d6b9 
).

Aaron Levinson
Matthieu Bouron May 13, 2017, 3:26 p.m. UTC | #2
On Fri, May 12, 2017 at 12:14:20PM -0700, Aaron Levinson wrote:
> On 5/12/2017 11:34 AM, Aman Gupta wrote:
> > From: Aman Gupta <aman@tmm1.net>
> > 
> > this dependency was removed in 33d69a90085d30af8a292d9364b835a26565d6b9
> > ---
> >  configure | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/configure b/configure
> > index 5ae5227868..ba33241a45 100755
> > --- a/configure
> > +++ b/configure
> > @@ -5766,8 +5766,7 @@ enabled decklink          && { { check_header DeckLinkAPI.h || die "ERROR: DeckL
> >  enabled frei0r            && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
> >  enabled gmp               && require gmp gmp.h mpz_export -lgmp
> >  enabled gnutls            && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
> > -enabled jni               && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads &&
> > -                               check_lib jni "dlfcn.h" dlopen -ldl || die "ERROR: jni not found"; }
> > +enabled jni               && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads || die "ERROR: jni not found"; }
> >  enabled ladspa            && { check_header ladspa.h || die "ERROR: ladspa.h header not found"; }
> >  enabled libiec61883       && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
> >  enabled libass            && require_pkg_config libass ass/ass.h ass_library_init
> > 
> 
> LGTM--I see that the use of dl was eliminated in 33d69a9 (at https://github.com/FFmpeg/FFmpeg/commit/33d69a90085d30af8a292d9364b835a26565d6b9
> ).

LGTM too.

Matthieu
Matthieu Bouron May 16, 2017, 8:35 a.m. UTC | #3
On Sat, May 13, 2017 at 05:26:13PM +0200, Matthieu Bouron wrote:
> On Fri, May 12, 2017 at 12:14:20PM -0700, Aaron Levinson wrote:
> > On 5/12/2017 11:34 AM, Aman Gupta wrote:
> > > From: Aman Gupta <aman@tmm1.net>
> > > 
> > > this dependency was removed in 33d69a90085d30af8a292d9364b835a26565d6b9
> > > ---
> > >  configure | 3 +--
> > >  1 file changed, 1 insertion(+), 2 deletions(-)
> > > 
> > > diff --git a/configure b/configure
> > > index 5ae5227868..ba33241a45 100755
> > > --- a/configure
> > > +++ b/configure
> > > @@ -5766,8 +5766,7 @@ enabled decklink          && { { check_header DeckLinkAPI.h || die "ERROR: DeckL
> > >  enabled frei0r            && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
> > >  enabled gmp               && require gmp gmp.h mpz_export -lgmp
> > >  enabled gnutls            && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
> > > -enabled jni               && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads &&
> > > -                               check_lib jni "dlfcn.h" dlopen -ldl || die "ERROR: jni not found"; }
> > > +enabled jni               && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads || die "ERROR: jni not found"; }
> > >  enabled ladspa            && { check_header ladspa.h || die "ERROR: ladspa.h header not found"; }
> > >  enabled libiec61883       && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
> > >  enabled libass            && require_pkg_config libass ass/ass.h ass_library_init
> > > 
> > 
> > LGTM--I see that the use of dl was eliminated in 33d69a9 (at https://github.com/FFmpeg/FFmpeg/commit/33d69a90085d30af8a292d9364b835a26565d6b9
> > ).
> 
> LGTM too.

Patch applied.

Thanks,
Matthieu
diff mbox

Patch

diff --git a/configure b/configure
index 5ae5227868..ba33241a45 100755
--- a/configure
+++ b/configure
@@ -5766,8 +5766,7 @@  enabled decklink          && { { check_header DeckLinkAPI.h || die "ERROR: DeckL
 enabled frei0r            && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
 enabled gmp               && require gmp gmp.h mpz_export -lgmp
 enabled gnutls            && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
-enabled jni               && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads &&
-                               check_lib jni "dlfcn.h" dlopen -ldl || die "ERROR: jni not found"; }
+enabled jni               && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads || die "ERROR: jni not found"; }
 enabled ladspa            && { check_header ladspa.h || die "ERROR: ladspa.h header not found"; }
 enabled libiec61883       && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
 enabled libass            && require_pkg_config libass ass/ass.h ass_library_init