[PATCH 0/3] Makefiles housekeeping III

[PATCH 0/3] Makefiles housekeeping III

[Xose Vazquez Perez]

Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>

Xose Vazquez Perez (3):
  multipath-tools: install libs in a standard way
  multipath-tools: merge OPTFLAGS into CFLAGS
  multipath-tools: delete INSTALL_PROGRAM from libmpathpersist/Makefile

 Makefile.inc             | 7 +++----
 libmpathpersist/Makefile | 4 +---
 libmultipath/Makefile    | 2 ++
 3 files changed, 6 insertions(+), 7 deletions(-)

-- 
2.7.4

[PATCH 1/3] multipath-tools: install libs in a standard way

[Xose Vazquez Perez]

Drop full path of libmpathpersist when linking,
and add a link for libmultipath.so

Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
 libmpathpersist/Makefile | 2 +-
 libmultipath/Makefile    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libmpathpersist/Makefile b/libmpathpersist/Makefile
index d22bcdd..2f91401 100644
--- a/libmpathpersist/Makefile
+++ b/libmpathpersist/Makefile
@@ -32,7 +32,7 @@ install: $(LIBS)
 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir)
 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(incdir)
-	$(LN) $(DESTDIR)$(syslibdir)/$(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
+	$(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
 	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
 	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
 	$(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(incdir)
diff --git a/libmultipath/Makefile b/libmultipath/Makefile
index de13e47..a14d4b3 100644
--- a/libmultipath/Makefile
+++ b/libmultipath/Makefile
@@ -63,9 +63,11 @@ install:
 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
+	$(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
 
 uninstall:
 	$(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
+	$(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
 
 clean:
 	$(RM) core *.a *.o *.gz *.so *.so.*
-- 
2.7.4

[PATCH 2/3] multipath-tools: merge OPTFLAGS into CFLAGS

[Xose Vazquez Perez]

OPTFLAGS is not used anywhere, but maybe it's intrusive for distributions.

Cc: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Cc: Dragan Stancevic <dragan.stancevic@canonical.com>
Cc: Louis Bouchard <louis.bouchard@canonical.com>
Cc: Ritesh Raj Sarraf <rrs@debian.org>
Cc: Benjamin Marzinski <bmarzins@redhat.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
 Makefile.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 01d743c..b7077fc 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -60,10 +60,9 @@ RM          = rm -f
 LN          = ln -sf
 INSTALL_PROGRAM = install
 
-OPTFLAGS     = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security -Wall \
-		-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
-
-CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
+CFLAGS      = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security -Wall \
+		-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 \
+		-fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
 SHARED_FLAGS = -shared
 
 %.o:	%.c
-- 
2.7.4

[PATCH 3/3] multipath-tools: delete INSTALL_PROGRAM from libmpathpersist/Makefile

[Xose Vazquez Perez]

It's already taken from "include ../Makefile.inc"

Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
 libmpathpersist/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libmpathpersist/Makefile b/libmpathpersist/Makefile
index 2f91401..a2dd7ed 100644
--- a/libmpathpersist/Makefile
+++ b/libmpathpersist/Makefile
@@ -3,8 +3,6 @@
 BUILD = glibc
 include ../Makefile.inc
 
-INSTALL_PROGRAM = install
-
 SONAME=0
 DEVLIB = libmpathpersist.so
 LIBS = $(DEVLIB).$(SONAME)
-- 
2.7.4

Re: [PATCH 0/3] Makefiles housekeeping III

[Christophe Varoqui]

[-- Attachment #1.1: Type: text/plain, Size: 725 bytes --]

This patchset is also merged.
Thanks, notably for the rework of the libs links.

On Fri, Jul 8, 2016 at 6:28 PM, Xose Vazquez Perez <xose.vazquez@gmail.com>
wrote:

> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> Cc: device-mapper development <dm-devel@redhat.com>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
>
> Xose Vazquez Perez (3):
>   multipath-tools: install libs in a standard way
>   multipath-tools: merge OPTFLAGS into CFLAGS
>   multipath-tools: delete INSTALL_PROGRAM from libmpathpersist/Makefile
>
>  Makefile.inc             | 7 +++----
>  libmpathpersist/Makefile | 4 +---
>  libmultipath/Makefile    | 2 ++
>  3 files changed, 6 insertions(+), 7 deletions(-)
>
> --
> 2.7.4
>
>

[-- Attachment #1.2: Type: text/html, Size: 1313 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 2/3] multipath-tools: merge OPTFLAGS into CFLAGS

[Ritesh Raj Sarraf]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Thanks Xose.

These changes are good with Debian.


Ritesh

On Fri, 2016-07-08 at 18:28 +0200, Xose Vazquez Perez wrote:
> OPTFLAGS is not used anywhere, but maybe it's intrusive for distributions.
> 
> Cc: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
> Cc: Dragan Stancevic <dragan.stancevic@canonical.com>
> Cc: Louis Bouchard <louis.bouchard@canonical.com>
> Cc: Ritesh Raj Sarraf <rrs@debian.org>
> Cc: Benjamin Marzinski <bmarzins@redhat.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> Cc: device-mapper development <dm-devel@redhat.com>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> ---
>  Makefile.inc | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile.inc b/Makefile.inc
> index 01d743c..b7077fc 100644
> --- a/Makefile.inc
> +++ b/Makefile.inc
> @@ -60,10 +60,9 @@ RM          = rm -f
>  LN          = ln -sf
>  INSTALL_PROGRAM = install
>  
> -OPTFLAGS     = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security
> -Wall \
> -		-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --
> param=ssp-buffer-size=4
> -
> -CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
> -DRUN_DIR=\"${RUN}\"
> +CFLAGS      = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security
> -Wall \
> +		-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --
> param=ssp-buffer-size=4 \
> +		-fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
>  SHARED_FLAGS = -shared
>  
>  %.o:	%.c
- -- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System
-----BEGIN PGP SIGNATURE-----

iQIcBAEBCgAGBQJXgMGjAAoJEKY6WKPy4XVps3IP/i8WjCdrGN/bhfpQgrt9wE09
JzYcLtqHMoUv3tT+YqJW3vpNgAn5UIujKkMogYbp5krvfG9MP4YFL0Vn4wI3EBTm
XXRnaBumHzE+QYhec7WnlTLEcv1RExyvyx8V1cqX7fFCzZfQGmjmoFQDL1CPN82Z
XbY0QfZWHBbpkNn57P7oCNGqnbL0IyqvVnNcTxmczALgySmp59w8WIS72kSiwMEH
mAgfYZ1Feql8Q1mQu1cQN8pPcFZgK0M4r2RtZ0SiQcQVtXVCDuhWCMQzV1eEvhPL
tAg78AJjnLFMDR8k9spKaGdLoyef7lTtxxUxyM6hEs08IpqxgedYD2lZvjqLNQmG
QTkkDfqDRnf+qeLuJMTxRCJavAXVO1f29ukynJ2Tm98LElxDEuW9UP10hGUHGA5U
KyBt/fCW9AUr0uTqO95+SCcHhNMyLuqDP5rZVJ7hCcbUtzGTbrAlQ8LIbX6BYDAc
tTTn27ZqGtQkV4h49YjIzhX8csCzrYejyI6ltIuKiePIPba2QnjaRp65C0zsR4IM
Gy7hvmugVIY7vMTFev9nk3qIgzu5kY6tA15Mw39o7Fc8uRyrFytmfX6Pzsv/OKCx
WKNpUYf3C5rU8OOdQ73fT2dEmb++rS99SB7Z0jEAAT9OCeDp+ffB+FVtm7rhohSF
lUrdul6jSduwV2pSlA5s
=NVXI
-----END PGP SIGNATURE-----

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel

Re: [PATCH 2/3] multipath-tools: merge OPTFLAGS into CFLAGS

[Hannes Reinecke]

On 07/08/2016 06:28 PM, Xose Vazquez Perez wrote:
> OPTFLAGS is not used anywhere, but maybe it's intrusive for distributions.
> 
> Cc: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
> Cc: Dragan Stancevic <dragan.stancevic@canonical.com>
> Cc: Louis Bouchard <louis.bouchard@canonical.com>
> Cc: Ritesh Raj Sarraf <rrs@debian.org>
> Cc: Benjamin Marzinski <bmarzins@redhat.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> Cc: device-mapper development <dm-devel@redhat.com>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> ---
>  Makefile.inc | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile.inc b/Makefile.inc
> index 01d743c..b7077fc 100644
> --- a/Makefile.inc
> +++ b/Makefile.inc
> @@ -60,10 +60,9 @@ RM          = rm -f
>  LN          = ln -sf
>  INSTALL_PROGRAM = install
>  
> -OPTFLAGS     = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security -Wall \
> -		-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
> -
> -CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
> +CFLAGS      = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security -Wall \
> +		-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 \
> +		-fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
>  SHARED_FLAGS = -shared
>  
>  %.o:	%.c
> 
Nope, doesn't work for us.
Our buildsystem is using a distinct set of flags, which we need to use
for the build process.
At the same time we have no idea if there are other flags (like includes
etc) which are required by the build itself.

Please revert, this breaks our build.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		   Teamlead Storage & Networking
hare@suse.de			               +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)

Re: [PATCH 2/3] multipath-tools: merge OPTFLAGS into CFLAGS

[Christophe Varoqui]

[-- Attachment #1.1: Type: text/plain, Size: 2300 bytes --]

Reverted.

On Fri, Jul 15, 2016 at 12:19 PM, Hannes Reinecke <hare@suse.de> wrote:

> On 07/08/2016 06:28 PM, Xose Vazquez Perez wrote:
> > OPTFLAGS is not used anywhere, but maybe it's intrusive for
> distributions.
> >
> > Cc: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
> > Cc: Dragan Stancevic <dragan.stancevic@canonical.com>
> > Cc: Louis Bouchard <louis.bouchard@canonical.com>
> > Cc: Ritesh Raj Sarraf <rrs@debian.org>
> > Cc: Benjamin Marzinski <bmarzins@redhat.com>
> > Cc: Hannes Reinecke <hare@suse.de>
> > Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> > Cc: device-mapper development <dm-devel@redhat.com>
> > Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> > ---
> >  Makefile.inc | 7 +++----
> >  1 file changed, 3 insertions(+), 4 deletions(-)
> >
> > diff --git a/Makefile.inc b/Makefile.inc
> > index 01d743c..b7077fc 100644
> > --- a/Makefile.inc
> > +++ b/Makefile.inc
> > @@ -60,10 +60,9 @@ RM          = rm -f
> >  LN          = ln -sf
> >  INSTALL_PROGRAM = install
> >
> > -OPTFLAGS     = -Wunused -Wstrict-prototypes -O2 -g -pipe
> -Wformat-security -Wall \
> > -             -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector
> --param=ssp-buffer-size=4
> > -
> > -CFLAGS            = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
> -DRUN_DIR=\"${RUN}\"
> > +CFLAGS      = -Wunused -Wstrict-prototypes -O2 -g -pipe
> -Wformat-security -Wall \
> > +             -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector
> --param=ssp-buffer-size=4 \
> > +             -fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
> >  SHARED_FLAGS = -shared
> >
> >  %.o: %.c
> >
> Nope, doesn't work for us.
> Our buildsystem is using a distinct set of flags, which we need to use
> for the build process.
> At the same time we have no idea if there are other flags (like includes
> etc) which are required by the build itself.
>
> Please revert, this breaks our build.
>
> Cheers,
>
> Hannes
> --
> Dr. Hannes Reinecke                Teamlead Storage & Networking
> hare@suse.de                                   +49 911 74053 688
> SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
> GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
> HRB 21284 (AG Nürnberg)
>

[-- Attachment #1.2: Type: text/html, Size: 3567 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]