public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/
@ 2016-08-08 12:37 James Le Cuirot
  0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2016-08-08 12:37 UTC (permalink / raw
  To: gentoo-commits

commit:     eda9940c61ea8ed2aad89bdcd5d256740a211fde
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug  3 18:57:02 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 16:37:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda9940c

dev-java/jna: remove unused patch

 dev-java/jna/files/jna-3.4.0-makefile-flags.patch | 62 -----------------------
 1 file changed, 62 deletions(-)

diff --git a/dev-java/jna/files/jna-3.4.0-makefile-flags.patch b/dev-java/jna/files/jna-3.4.0-makefile-flags.patch
deleted file mode 100644
index e4ff00b..0000000
--- a/dev-java/jna/files/jna-3.4.0-makefile-flags.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/native/Makefile b/native/Makefile
-index 75246a8..a1c3e66 100644
---- a/native/Makefile
-+++ b/native/Makefile
-@@ -70,7 +70,7 @@ LIBPFX=lib
- LIBSFX=.so
- ARSFX=.a
- JNISFX=$(LIBSFX)
--CC=gcc
-+CC?=gcc
- LD=$(CC)
- LIBS=
- # Default to Sun recommendations for JNI compilation
-@@ -83,10 +83,10 @@ CFLAGS_EXTRA=
- COUT=-o $@
- CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
- CDEFINES=-D_REENTRANT
--PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
--CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
-+PCFLAGS=-Wall -Wno-unused -Wno-parentheses
-+CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
-        -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
--LDFLAGS=-o $@ -shared 
-+LDFLAGS+=-o $@ -shared 
- ifeq ($(DYNAMIC_LIBFFI),true)
- CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
- LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
-@@ -149,7 +149,7 @@ ifneq ($(MINGW),)
- CDEFINES=-DPSAPI_VERSION=1
- CC = $(MINGW) -m64 -mno-cygwin
- LD = $(CC)
--LDFLAGS=-o $@ -shared
-+LDFLAGS+=-o $@ -shared
- LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt 
- FFI_CONFIG += --host=x86_64-pc-mingw32
- else
-@@ -169,14 +169,14 @@ ifeq ($(OS),linux)
- ARCH=$(shell uname -m | sed 's/i.86/i386/g')
- PCFLAGS+=-fPIC
- CDEFINES+=-DHAVE_PROTECTION
--LDFLAGS+=-Wl,-soname,$@
-+LDFLAGS+= -Wl,-soname,$(shell basename $@)
- endif
- 
- ifneq (,$(findstring bsd,$(OS)))
- ARCH=$(shell uname -m | sed 's/i.86/i386/g')
- PCFLAGS+=-fPIC
- CINCLUDES+=-I/usr/X11R6/include
--LDFLAGS=-o $@ -shared 
-+LDFLAGS+= -o $@ -shared 
- CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
- endif
- 
-@@ -239,7 +239,7 @@ endif
- 
- PCFLAGS+=$(ISYSROOT) -x objective-c
- CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
--LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
-+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
-   -compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
-   -current_version $(JNA_JNI_VERSION) \
-   -mmacosx-version-min=10.3 \


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/
@ 2022-07-16  3:29 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2022-07-16  3:29 UTC (permalink / raw
  To: gentoo-commits

commit:     480352472c5429f37cd7c7cebd867c7fdb0896c3
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jul 15 18:27:19 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 03:29:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48035247

dev-java/jna: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26423
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/jna/files/4.2.2-makefile-flags.patch | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/dev-java/jna/files/4.2.2-makefile-flags.patch b/dev-java/jna/files/4.2.2-makefile-flags.patch
deleted file mode 100644
index 3e290ece4e78..000000000000
--- a/dev-java/jna/files/4.2.2-makefile-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/native/Makefile	2016-03-16 14:37:28.000000000 +0000
-+++ b/native/Makefile	2016-04-16 22:27:06.426345376 +0100
-@@ -81,7 +81,7 @@
- LIBSFX=.so
- ARSFX=.a
- JNISFX=$(LIBSFX)
--CC=gcc
-+CC?=gcc
- LD=$(CC)
- LIBS=
- # Default to Sun recommendations for JNI compilation
-@@ -94,10 +94,10 @@
- COUT=-o $@
- CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
- CDEFINES=-D_REENTRANT
--PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
--CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
-+PCFLAGS=-Wall -Wno-unused -Wno-parentheses
-+CFLAGS+= $(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
-        -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
--LDFLAGS=-o $@ -shared
-+LDFLAGS+= -o $@ -shared
- ifeq ($(DYNAMIC_LIBFFI),true)
- CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
- LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-07-16  3:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-08 12:37 [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2022-07-16  3:29 Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox