[Mesa-dev] [PATCH] mapi: Use correct shared library name on macOS.

Eric Engestrom eric.engestrom at imgtec.com
Wed Nov 15 10:07:56 UTC 2017


On Tuesday, 2017-11-14 17:57:38 -0800, Dylan Baker wrote:
> I think "suffix" would be better for the title "name". Also, library ->
> libraries.
> 
> With that changed:
> Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

> 
> Quoting Vinson Lee (2017-11-14 17:17:49)
> > Signed-off-by: Vinson Lee <vlee at freedesktop.org>
> > ---
> >  src/mapi/es1api/ABI-check | 7 ++++++-
> >  src/mapi/es2api/ABI-check | 7 ++++++-
> >  2 files changed, 12 insertions(+), 2 deletions(-)
> > 
> > diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check
> > index bd9d0288d60d..0a867343c79a 100755
> > --- a/src/mapi/es1api/ABI-check
> > +++ b/src/mapi/es1api/ABI-check
> > @@ -9,7 +9,12 @@ set -eu
> >  # or in extensions that are part of the ES 1.1 extension pack.
> >  # (see http://www.khronos.org/registry/gles/specs/1.1/opengles_spec_1_1_extension_pack.pdf)
> >  
> > -LIB=${1-es1api/.libs/libGLESv1_CM.so.1}
> > +if [ $(uname) == "Darwin" ]
> > +then
> > +  LIB=${1-es1api/.libs/libGLESv1_CM.dylib}
> > +else
> > +  LIB=${1-es1api/.libs/libGLESv1_CM.so.1}
> > +fi
> >  
> >  if ! [ -f "$LIB" ]
> >  then
> > diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check
> > index 179bea132e3b..716e6679a49f 100755
> > --- a/src/mapi/es2api/ABI-check
> > +++ b/src/mapi/es2api/ABI-check
> > @@ -6,7 +6,12 @@ set -eu
> >  # GL_EXT_multi_draw_arrays
> >  # GL_OES_EGL_image
> >  
> > -LIB=${1-es2api/.libs/libGLESv2.so.2}
> > +if [ $(uname) == "Darwin" ]
> > +then
> > +  LIB=${1-es2api/.libs/libGLESv2.dylib}
> > +else
> > +  LIB=${1-es2api/.libs/libGLESv2.so.2}
> > +fi
> >  
> >  if ! [ -f "$LIB" ]
> >  then
> > -- 
> > 2.15.0
> > 
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list