diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 18:34:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 18:46:38 +0100 |
| commit | 7c4f2ec8a795534164ee1923093b7d5be0126c55 (patch) | |
| tree | 08971f4c7375629393b6d9cdeb713006778334bf /cairo | |
| parent | 8c9823d311fdf8092cc75873e4565325d204a658 (diff) | |
Simplify install name handling for external libraries on Mac OS X
...by allowing our special @___... tokens anywhere within an install name,
so that external modules can configure --prefix=/@___... etc. This removes
the need for the special extshl and EXTRPATH=LOADER. Also, a new
OUT2BIN_NONE can be used for external modules where the generated libraries
need the default EXTRPATH=OOO, but generated executables are only used
during the build and such need RPATH=NONE.
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 5 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 8f2a359205c8..16a89bfad9a4 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -241,6 +241,10 @@ CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAG CONFIGURE_FLAGS+=png_CFLAGS="-I$(SOLARINCDIR)$/external$/libpng" png_LIBS="-L$(SOLARLIBDIR) -lpng" .ENDIF +.IF "$(OS)" == "MACOSX" +CONFIGURE_FLAGS += \ + --prefix=/@.__________________________________________________$(EXTRPATH) +.END OUT2INC+=cairo-version.h \ src$/cairo-deprecated.h \ @@ -250,7 +254,6 @@ OUT2INC+=cairo-version.h \ src$/cairo.h .IF "$(OS)"=="MACOSX" -EXTRPATH=LOADER OUT2LIB+=src$/.libs$/libcairo*.dylib .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 44ea09bdc137..f4dab40f744a 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -145,7 +145,12 @@ CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)" CONFIGURE_FLAGS+=--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt -.ENDIF +.ELIF "$(OS)" == "MACOSX" + +CONFIGURE_FLAGS += \ + --prefix=/@.__________________________________________________$(EXTRPATH) + +.END .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) |